Skip to content

Conversation

@max-zilla
Copy link
Contributor

Adds support for a unique_key and owner parameter to register extractors for personal use. Links to come for related pyclowder and extractor code.

@CLAassistant
Copy link

CLAassistant commented Feb 15, 2022

CLA assistant check
All committers have signed the CLA.

@lmarini lmarini requested review from ddey2 and lmarini June 3, 2022 16:08
@lmarini lmarini marked this pull request as ready for review June 3, 2022 16:08
Copy link
Member

@robkooper robkooper left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, need to do testing

}
val upper_categories = categories.map(cat => cat.toUpperCase)
val category_match = categories.length == 0 || doc.categories.intersect(upper_categories).length > 0
val category_match = doc.categories.length == 0 || doc.categories.intersect(upper_categories).length > 0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

was this a bug?

Copy link
Member

@ddey2 ddey2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested it.Looks good to me

@robkooper robkooper added this to the 1.21.0 milestone Aug 26, 2022
Copy link
Member

@lmarini lmarini left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Max is adding checks to api.Extractions.submitFileToExtractor and api.Extractions.submitDatasetToExtractor

@robkooper robkooper changed the base branch from develop to release/1.21.0 September 6, 2022 20:46
@robkooper
Copy link
Member

not sure why the checks are not running, but on my local machine I get compile errors:

[error] /Users/kooper/git/clowder/clowder/app/controllers/Extractors.scala:44: not enough arguments for method getExtractorInfo: (extractorName: String, extractorKey: Option[String], user: Option[models.User])Option[models.ExtractorInfo].
[error] Unspecified value parameter user.
[error]     extractorService.getExtractorInfo(extractorName, extractor_key) match {
[error]                                      ^
[error] /Users/kooper/git/clowder/clowder/app/api/Extractions.scala:383: not enough arguments for method getExtractorInfo: (extractorName: String, extractorKey: Option[String], user: Option[models.User])Option[models.ExtractorInfo].
[error] Unspecified value parameter user.
[error]     extractors.getExtractorInfo(extractorName, extractor_key) match {
[error]                                ^
[error] /Users/kooper/git/clowder/clowder/app/api/Extractions.scala:525: not enough arguments for method getExtractorInfo: (extractorName: String, extractorKey: Option[String], user: Option[models.User])Option[models.ExtractorInfo].
[error] Unspecified value parameters extractorName, extractorKey, user.
[error]               extractors.getExtractorInfo()
[error]                                          ^
[error] /Users/kooper/git/clowder/clowder/app/services/ExtractorRoutingService.scala:79: not enough arguments for method getExtractorInfo: (extractorName: String, extractorKey: Option[String], user: Option[models.User])Option[models.ExtractorInfo].
[error] Unspecified value parameter user.
[error]       extractorsService.getExtractorInfo(exId, None)).filter(exInfo => {
[error]                                         ^

@robkooper robkooper modified the milestones: 1.21.0, 1.22.0 Sep 7, 2022
Base automatically changed from release/1.21.0 to master September 8, 2022 03:26
@max-zilla max-zilla requested a review from lmarini September 9, 2022 16:04
@lmarini lmarini requested a review from robkooper November 2, 2022 18:44
@lmarini lmarini changed the base branch from master to develop November 2, 2022 18:45
@robkooper robkooper merged commit ae5c90f into develop Dec 14, 2022
@robkooper robkooper deleted the workbench-private-endpoint branch December 14, 2022 20:29
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.

6 participants