Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[HOPSWORKS-2447] Pip conflicts modal not closing when clicking confirm #842

Merged
merged 1 commit into from
Mar 26, 2021

Conversation

robzor92
Copy link
Contributor

Make sure there is no duplicate PR for this issue

  • Please check if the PR meets the following requirements
  • Adds tests for the submitted changes (for bug fixes & features)
  • Passes the tests
  • HOPSWORKS JIRA issue has been opened for this PR
  • All commits have been squashed down to a single commit
  • Post a link to the associated JIRA issue

  • What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)

  • What is the new behavior (if this is a feature change)?

  • Does this PR introduce a breaking change? (What changes might users need to make in their application due to this PR?)

  • Other information:

@robzor92 robzor92 requested a review from ErmiasG March 26, 2021 10:32
@robzor92 robzor92 merged commit 5422a94 into logicalclocks:master Mar 26, 2021
kennethmhc added a commit to kennethmhc/hopsworks that referenced this pull request May 18, 2022
* [HOPSWORKS-2945] [FeatureView] Implement activity endpoints (logicalclocks#829)

* init

* big fixes

* Update ActivityResource.java

* Update FeatureViewController.java

* Update FeatureViewController.java

* add logging of activity for FV

* Update feature_store_activity_spec.rb

* Update feature_store_activity_spec.rb

* Update featurestore_helper.rb

* Update featurestore_helper.rb

* Update FeatureViewController.java

* add statistics

* [HOPSWORKS-2947] [ModelFeature] Implement PrepareStatementResource (logicalclocks#824)

* init

* improvements

* small changes to the backend

* temp

* Update FeatureViewController.java

* Update preparedstatements_spec.rb

* standardize

* Update featurestore_helper.rb

* small updates

* small changes

* Update preparedstatements_spec.rb

* addressing feedback

* change endpoint to lower case

* [HOPSWORKS-2943] Add query resource (logicalclocks#834)

* implement batch query endpoint

* handle empty start or end time

* throw feature store exception

* return original query

* check nested join

* fix NPE for join

* add feature group to feature

* return features properly.

* add IT for batch query

* fix batch query test

* set commit time to query

* add timetravel condition

* reuse get_query from TrainingDatasetController

* pass withLabel and isHiveEngine when constructing batch query

* reformat

* test get query

* add test for get query

* remove object variables

* fix indentation

* refactor getJoinsSorted

* fix format

* reformat

* use getSingleByNameVersionAndFeatureStore

* add query filter to FV

* refactor event time filter, add unit test

* fix resourcerequest NPE

* add featureview to trainingdatasetfilter

* add query filter to IT

Co-authored-by: Kenneth Mak <[email protected]>

* [HOPSWORKS-2944] Implement keyword related endpoints (logicalclocks#842)

* needs inode to function

* add inode

* Update FeatureView.java

* Update FeatureViewController.java

* Update ProjectController.java

* changes with inode

* Update FeatureViewController.java

* inode work

* Update FeatureViewController.java

* Update FeatureViewController.java

* Update FeatureViewController.java

* Update FeatureViewController.java

* Update ProjectController.java

* permissions

* small changes

* tests

* Update featureview_keywords_spec.rb

* some feedback addressed

* add featureView xattr

* Update FeatureViewBuilder.java

* Update FeatureViewController.java

* Update FeatureViewController.java

* Update FeatureViewController.java

* save hopsfs connector

* Update ProjectController.java

* Update FeatureViewController.java

* Update FeatureViewController.java

* add features to featureViewDTO

* Update FeatureViewBuilder.java

* Update HopsFSProvenanceController.java

* removing fv dir

* Update FeaturestoreController.java

* path changes for fv

* restructure fv path

* Update HopsFSProvenanceController.java

* Update HopsworksJAXBContext.java

* Update featureview_keywords_spec.rb

* some of the comments addressed

* remove keyword controller duplication

* make createFeatureView use and return FeatureView instead of FeatureViewDTO

* Update FeatureViewBuilder.java

* Update FeaturestoreKeywordResource.java

* change feature view path

* Update featureview_keywords_spec.rb

* Update featureview_keywords_spec.rb

* [HOPSWORKS-2946] Add transformation resource and statistics resource (logicalclocks#856)

* get transformation function

* statistics resource

* fix statistics dto forTransformation

* fix transformation uri

* add IT for transformation

* change statistics folder name

* remove td from feature view statistics

* delete statistics along with feature view

* add IT for feature view statistics

* Revert "add IT for feature view statistics"

This reverts commit db49dd0971fe1cdc7929f8fd0c13a5249c451ff0.

* Revert "delete statistics along with feature view"

This reverts commit 697768d51b186c14e2d451858f0552df1d8ffa77.

* Revert "change statistics folder name"

This reverts commit 922c17f94c14c50a771b7d70f04154712305ab19.

* Revert "fix statistics dto forTransformation"

This reverts commit 3143984906d6cc8eced6fb3349d24c4a0a4df360.

* Revert "statistics resource"

This reverts commit 7361bd8ff06ffff239285bfb8360f25ba14ef68a.

* fix access control

* refactor uri

* [FeatureView] return original query as expansion (logicalclocks#866)

* [HOPSWORKS-2942] Implement TagResource (logicalclocks#864)

* init

* Update TagResource.java

* Update TagResource.java

* bug fixing/standardization

* tests

* generic tags resource

* fix for the abstract tags resource

* some feedback addressed

* Update TagsResource.java

Co-authored-by: Alex Ormenisan <[email protected]>

* [HOPSWORKS-3064] [FeatureView] Allow update of metadata in FeatureView resource (logicalclocks#895)

* init

* Update FeatureViewResource.java

* bug fixing

* Update featureview_spec.rb

* Update featureview_spec.rb

* [HOPSWORKS-2941] Implement Training Dataset resource (logicalclocks#845)

* implement batch query endpoint

* throw feature store exception

* return features properly.

* add IT for batch query

* fix batch query test

* reuse get_query from TrainingDatasetController

* create td

* compute td

* get td

* delete td

* delete td data only

* fix compile

* reformat

* set feature view

* set featurestore and project

* implement statistics resource

* handle hopsfstrainingdataset is null

* return all td

* fix create and get td

* do not return query in dto

* skip feature in dto

* set query in job config

* add td IT

* add td IT

* fix internal td it

* external td IT

* add external td test

* rename create td method

* reformat

* move query related methods to QueryController

* revert unintended changes

* refactor get FV

* fix failed tests

* fix comments

* check name of training dataset in IT

* check name of feature view against td

* keep td folder when deleting data only

* fix failed test

* fix failed test

* remove extra update

* return features after creating fv

* fix td exist error

* create feature view td job

* do not assume a split if splits is empty

* remove extra get annotation

* set default td name = fv name + version

* return batch query as object

* set start time and end time to td

* return feature group in correct type

* throw exception if feature not found

* fix test

* fix feature to featuredto map

* fix query test

* [Append] training dataset resource

remove redundant lines in test

* rebase

* [Hopsworks-3063] [FeatureView] Allow update of metadata in TrainingDataset resource (logicalclocks#921)

* init

* Update featurestore_helper.rb

* Update featureview_trainingdataset_spec.rb

* remove label from feature view table (logicalclocks#924)

* [HOPSWORKS-3073] [FeatureView] Remove ResourceRequest from FeatureViewController (logicalclocks#925)

* init

small changes also on other endpoints to standardize

* addressing the feedback

* [HOPSWORKS-2941] [Append]  td resource (logicalclocks#930)

* fix dataset

* fix infinite loop when getting all feature groups

* change event time type

* use date as event time in batch query

* add in memory td

* fix prepared statement comment

* refactor commit time

* fix keyword resource

* fix transformation

* remove unused import

* assign storage connector to in-memory td

* fix integration test

Co-authored-by: Ralf <[email protected]>
Co-authored-by: Kenneth Mak <[email protected]>
Co-authored-by: Alex Ormenisan <[email protected]>
(cherry picked from commit af28c64)

# Conflicts:
#	featurestore-ee/src/main/java/io/hops/hopsworks/featurestore/KeywordController.java
#	hopsworks-IT/src/test/ruby/spec/ee_tags_spec.rb
#	hopsworks-IT/src/test/ruby/spec/helpers/tag_helper.rb
#	hopsworks-api/src/main/java/io/hops/hopsworks/api/featurestore/featureview/FeatureViewResource.java
#	hopsworks-api/src/main/java/io/hops/hopsworks/api/featurestore/featureview/FeatureViewService.java
#	hopsworks-api/src/main/java/io/hops/hopsworks/api/featurestore/featureview/FeatureViewTagResource.java
#	hopsworks-api/src/main/java/io/hops/hopsworks/api/featurestore/preparestatement/PreparedStatementResource.java
#	hopsworks-api/src/main/java/io/hops/hopsworks/api/featurestore/query/QueryResource.java
#	hopsworks-api/src/main/java/io/hops/hopsworks/api/featurestore/trainingdataset/TrainingDatasetResource.java
#	hopsworks-api/src/main/java/io/hops/hopsworks/api/featurestore/transformation/TransformationResource.java
kennethmhc added a commit that referenced this pull request May 19, 2022
* [HOPSWORKS-3125] Feature view  (#923)

* [HOPSWORKS-2945] [FeatureView] Implement activity endpoints (#829)

* init

* big fixes

* Update ActivityResource.java

* Update FeatureViewController.java

* Update FeatureViewController.java

* add logging of activity for FV

* Update feature_store_activity_spec.rb

* Update feature_store_activity_spec.rb

* Update featurestore_helper.rb

* Update featurestore_helper.rb

* Update FeatureViewController.java

* add statistics

* [HOPSWORKS-2947] [ModelFeature] Implement PrepareStatementResource (#824)

* init

* improvements

* small changes to the backend

* temp

* Update FeatureViewController.java

* Update preparedstatements_spec.rb

* standardize

* Update featurestore_helper.rb

* small updates

* small changes

* Update preparedstatements_spec.rb

* addressing feedback

* change endpoint to lower case

* [HOPSWORKS-2943] Add query resource (#834)

* implement batch query endpoint

* handle empty start or end time

* throw feature store exception

* return original query

* check nested join

* fix NPE for join

* add feature group to feature

* return features properly.

* add IT for batch query

* fix batch query test

* set commit time to query

* add timetravel condition

* reuse get_query from TrainingDatasetController

* pass withLabel and isHiveEngine when constructing batch query

* reformat

* test get query

* add test for get query

* remove object variables

* fix indentation

* refactor getJoinsSorted

* fix format

* reformat

* use getSingleByNameVersionAndFeatureStore

* add query filter to FV

* refactor event time filter, add unit test

* fix resourcerequest NPE

* add featureview to trainingdatasetfilter

* add query filter to IT

Co-authored-by: Kenneth Mak <[email protected]>

* [HOPSWORKS-2944] Implement keyword related endpoints (#842)

* needs inode to function

* add inode

* Update FeatureView.java

* Update FeatureViewController.java

* Update ProjectController.java

* changes with inode

* Update FeatureViewController.java

* inode work

* Update FeatureViewController.java

* Update FeatureViewController.java

* Update FeatureViewController.java

* Update FeatureViewController.java

* Update ProjectController.java

* permissions

* small changes

* tests

* Update featureview_keywords_spec.rb

* some feedback addressed

* add featureView xattr

* Update FeatureViewBuilder.java

* Update FeatureViewController.java

* Update FeatureViewController.java

* Update FeatureViewController.java

* save hopsfs connector

* Update ProjectController.java

* Update FeatureViewController.java

* Update FeatureViewController.java

* add features to featureViewDTO

* Update FeatureViewBuilder.java

* Update HopsFSProvenanceController.java

* removing fv dir

* Update FeaturestoreController.java

* path changes for fv

* restructure fv path

* Update HopsFSProvenanceController.java

* Update HopsworksJAXBContext.java

* Update featureview_keywords_spec.rb

* some of the comments addressed

* remove keyword controller duplication

* make createFeatureView use and return FeatureView instead of FeatureViewDTO

* Update FeatureViewBuilder.java

* Update FeaturestoreKeywordResource.java

* change feature view path

* Update featureview_keywords_spec.rb

* Update featureview_keywords_spec.rb

* [HOPSWORKS-2946] Add transformation resource and statistics resource (#856)

* get transformation function

* statistics resource

* fix statistics dto forTransformation

* fix transformation uri

* add IT for transformation

* change statistics folder name

* remove td from feature view statistics

* delete statistics along with feature view

* add IT for feature view statistics

* Revert "add IT for feature view statistics"

This reverts commit db49dd0971fe1cdc7929f8fd0c13a5249c451ff0.

* Revert "delete statistics along with feature view"

This reverts commit 697768d51b186c14e2d451858f0552df1d8ffa77.

* Revert "change statistics folder name"

This reverts commit 922c17f94c14c50a771b7d70f04154712305ab19.

* Revert "fix statistics dto forTransformation"

This reverts commit 3143984906d6cc8eced6fb3349d24c4a0a4df360.

* Revert "statistics resource"

This reverts commit 7361bd8ff06ffff239285bfb8360f25ba14ef68a.

* fix access control

* refactor uri

* [FeatureView] return original query as expansion (#866)

* [HOPSWORKS-2942] Implement TagResource (#864)

* init

* Update TagResource.java

* Update TagResource.java

* bug fixing/standardization

* tests

* generic tags resource

* fix for the abstract tags resource

* some feedback addressed

* Update TagsResource.java

Co-authored-by: Alex Ormenisan <[email protected]>

* [HOPSWORKS-3064] [FeatureView] Allow update of metadata in FeatureView resource (#895)

* init

* Update FeatureViewResource.java

* bug fixing

* Update featureview_spec.rb

* Update featureview_spec.rb

* [HOPSWORKS-2941] Implement Training Dataset resource (#845)

* implement batch query endpoint

* throw feature store exception

* return features properly.

* add IT for batch query

* fix batch query test

* reuse get_query from TrainingDatasetController

* create td

* compute td

* get td

* delete td

* delete td data only

* fix compile

* reformat

* set feature view

* set featurestore and project

* implement statistics resource

* handle hopsfstrainingdataset is null

* return all td

* fix create and get td

* do not return query in dto

* skip feature in dto

* set query in job config

* add td IT

* add td IT

* fix internal td it

* external td IT

* add external td test

* rename create td method

* reformat

* move query related methods to QueryController

* revert unintended changes

* refactor get FV

* fix failed tests

* fix comments

* check name of training dataset in IT

* check name of feature view against td

* keep td folder when deleting data only

* fix failed test

* fix failed test

* remove extra update

* return features after creating fv

* fix td exist error

* create feature view td job

* do not assume a split if splits is empty

* remove extra get annotation

* set default td name = fv name + version

* return batch query as object

* set start time and end time to td

* return feature group in correct type

* throw exception if feature not found

* fix test

* fix feature to featuredto map

* fix query test

* [Append] training dataset resource

remove redundant lines in test

* rebase

* [Hopsworks-3063] [FeatureView] Allow update of metadata in TrainingDataset resource (#921)

* init

* Update featurestore_helper.rb

* Update featureview_trainingdataset_spec.rb

* remove label from feature view table (#924)

* [HOPSWORKS-3073] [FeatureView] Remove ResourceRequest from FeatureViewController (#925)

* init

small changes also on other endpoints to standardize

* addressing the feedback

* [HOPSWORKS-2941] [Append]  td resource (#930)

* fix dataset

* fix infinite loop when getting all feature groups

* change event time type

* use date as event time in batch query

* add in memory td

* fix prepared statement comment

* refactor commit time

* fix keyword resource

* fix transformation

* remove unused import

* assign storage connector to in-memory td

* fix integration test

Co-authored-by: Ralf <[email protected]>
Co-authored-by: Kenneth Mak <[email protected]>
Co-authored-by: Alex Ormenisan <[email protected]>
(cherry picked from commit af28c64)

# Conflicts:
#	featurestore-ee/src/main/java/io/hops/hopsworks/featurestore/KeywordController.java
#	hopsworks-IT/src/test/ruby/spec/ee_tags_spec.rb
#	hopsworks-IT/src/test/ruby/spec/helpers/tag_helper.rb
#	hopsworks-api/src/main/java/io/hops/hopsworks/api/featurestore/featureview/FeatureViewResource.java
#	hopsworks-api/src/main/java/io/hops/hopsworks/api/featurestore/featureview/FeatureViewService.java
#	hopsworks-api/src/main/java/io/hops/hopsworks/api/featurestore/featureview/FeatureViewTagResource.java
#	hopsworks-api/src/main/java/io/hops/hopsworks/api/featurestore/preparestatement/PreparedStatementResource.java
#	hopsworks-api/src/main/java/io/hops/hopsworks/api/featurestore/query/QueryResource.java
#	hopsworks-api/src/main/java/io/hops/hopsworks/api/featurestore/trainingdataset/TrainingDatasetResource.java
#	hopsworks-api/src/main/java/io/hops/hopsworks/api/featurestore/transformation/TransformationResource.java

* [HOPSWORKS-3125] [append] Feature view fix end time error #944

(cherry picked from commit 3c064ff)
smkniazi pushed a commit to smkniazi/hopsworks that referenced this pull request Oct 25, 2022
* [HOPSWORKS-2945] [FeatureView] Implement activity endpoints (logicalclocks#829)

* init

* big fixes

* Update ActivityResource.java

* Update FeatureViewController.java

* Update FeatureViewController.java

* add logging of activity for FV

* Update feature_store_activity_spec.rb

* Update feature_store_activity_spec.rb

* Update featurestore_helper.rb

* Update featurestore_helper.rb

* Update FeatureViewController.java

* add statistics

* [HOPSWORKS-2947] [ModelFeature] Implement PrepareStatementResource (logicalclocks#824)

* init

* improvements

* small changes to the backend

* temp

* Update FeatureViewController.java

* Update preparedstatements_spec.rb

* standardize

* Update featurestore_helper.rb

* small updates

* small changes

* Update preparedstatements_spec.rb

* addressing feedback

* change endpoint to lower case

* [HOPSWORKS-2943] Add query resource (logicalclocks#834)

* implement batch query endpoint

* handle empty start or end time

* throw feature store exception

* return original query

* check nested join

* fix NPE for join

* add feature group to feature

* return features properly.

* add IT for batch query

* fix batch query test

* set commit time to query

* add timetravel condition

* reuse get_query from TrainingDatasetController

* pass withLabel and isHiveEngine when constructing batch query

* reformat

* test get query

* add test for get query

* remove object variables

* fix indentation

* refactor getJoinsSorted

* fix format

* reformat

* use getSingleByNameVersionAndFeatureStore

* add query filter to FV

* refactor event time filter, add unit test

* fix resourcerequest NPE

* add featureview to trainingdatasetfilter

* add query filter to IT

Co-authored-by: Kenneth Mak <[email protected]>

* [HOPSWORKS-2944] Implement keyword related endpoints (logicalclocks#842)

* needs inode to function

* add inode

* Update FeatureView.java

* Update FeatureViewController.java

* Update ProjectController.java

* changes with inode

* Update FeatureViewController.java

* inode work

* Update FeatureViewController.java

* Update FeatureViewController.java

* Update FeatureViewController.java

* Update FeatureViewController.java

* Update ProjectController.java

* permissions

* small changes

* tests

* Update featureview_keywords_spec.rb

* some feedback addressed

* add featureView xattr

* Update FeatureViewBuilder.java

* Update FeatureViewController.java

* Update FeatureViewController.java

* Update FeatureViewController.java

* save hopsfs connector

* Update ProjectController.java

* Update FeatureViewController.java

* Update FeatureViewController.java

* add features to featureViewDTO

* Update FeatureViewBuilder.java

* Update HopsFSProvenanceController.java

* removing fv dir

* Update FeaturestoreController.java

* path changes for fv

* restructure fv path

* Update HopsFSProvenanceController.java

* Update HopsworksJAXBContext.java

* Update featureview_keywords_spec.rb

* some of the comments addressed

* remove keyword controller duplication

* make createFeatureView use and return FeatureView instead of FeatureViewDTO

* Update FeatureViewBuilder.java

* Update FeaturestoreKeywordResource.java

* change feature view path

* Update featureview_keywords_spec.rb

* Update featureview_keywords_spec.rb

* [HOPSWORKS-2946] Add transformation resource and statistics resource (logicalclocks#856)

* get transformation function

* statistics resource

* fix statistics dto forTransformation

* fix transformation uri

* add IT for transformation

* change statistics folder name

* remove td from feature view statistics

* delete statistics along with feature view

* add IT for feature view statistics

* Revert "add IT for feature view statistics"

This reverts commit db49dd0971fe1cdc7929f8fd0c13a5249c451ff0.

* Revert "delete statistics along with feature view"

This reverts commit 697768d51b186c14e2d451858f0552df1d8ffa77.

* Revert "change statistics folder name"

This reverts commit 922c17f94c14c50a771b7d70f04154712305ab19.

* Revert "fix statistics dto forTransformation"

This reverts commit 3143984906d6cc8eced6fb3349d24c4a0a4df360.

* Revert "statistics resource"

This reverts commit 7361bd8ff06ffff239285bfb8360f25ba14ef68a.

* fix access control

* refactor uri

* [FeatureView] return original query as expansion (logicalclocks#866)

* [HOPSWORKS-2942] Implement TagResource (logicalclocks#864)

* init

* Update TagResource.java

* Update TagResource.java

* bug fixing/standardization

* tests

* generic tags resource

* fix for the abstract tags resource

* some feedback addressed

* Update TagsResource.java

Co-authored-by: Alex Ormenisan <[email protected]>

* [HOPSWORKS-3064] [FeatureView] Allow update of metadata in FeatureView resource (logicalclocks#895)

* init

* Update FeatureViewResource.java

* bug fixing

* Update featureview_spec.rb

* Update featureview_spec.rb

* [HOPSWORKS-2941] Implement Training Dataset resource (logicalclocks#845)

* implement batch query endpoint

* throw feature store exception

* return features properly.

* add IT for batch query

* fix batch query test

* reuse get_query from TrainingDatasetController

* create td

* compute td

* get td

* delete td

* delete td data only

* fix compile

* reformat

* set feature view

* set featurestore and project

* implement statistics resource

* handle hopsfstrainingdataset is null

* return all td

* fix create and get td

* do not return query in dto

* skip feature in dto

* set query in job config

* add td IT

* add td IT

* fix internal td it

* external td IT

* add external td test

* rename create td method

* reformat

* move query related methods to QueryController

* revert unintended changes

* refactor get FV

* fix failed tests

* fix comments

* check name of training dataset in IT

* check name of feature view against td

* keep td folder when deleting data only

* fix failed test

* fix failed test

* remove extra update

* return features after creating fv

* fix td exist error

* create feature view td job

* do not assume a split if splits is empty

* remove extra get annotation

* set default td name = fv name + version

* return batch query as object

* set start time and end time to td

* return feature group in correct type

* throw exception if feature not found

* fix test

* fix feature to featuredto map

* fix query test

* [Append] training dataset resource

remove redundant lines in test

* rebase

* [Hopsworks-3063] [FeatureView] Allow update of metadata in TrainingDataset resource (logicalclocks#921)

* init

* Update featurestore_helper.rb

* Update featureview_trainingdataset_spec.rb

* remove label from feature view table (logicalclocks#924)

* [HOPSWORKS-3073] [FeatureView] Remove ResourceRequest from FeatureViewController (logicalclocks#925)

* init

small changes also on other endpoints to standardize

* addressing the feedback

* [HOPSWORKS-2941] [Append]  td resource (logicalclocks#930)

* fix dataset

* fix infinite loop when getting all feature groups

* change event time type

* use date as event time in batch query

* add in memory td

* fix prepared statement comment

* refactor commit time

* fix keyword resource

* fix transformation

* remove unused import

* assign storage connector to in-memory td

* fix integration test

Co-authored-by: Ralf <[email protected]>
Co-authored-by: Kenneth Mak <[email protected]>
Co-authored-by: Alex Ormenisan <[email protected]>
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants