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

fix: S3 and URL wrongly handled #93

Merged
merged 7 commits into from
Feb 7, 2024
Merged

fix: S3 and URL wrongly handled #93

merged 7 commits into from
Feb 7, 2024

Conversation

BertrandRenault
Copy link
Contributor

@BertrandRenault BertrandRenault commented Feb 5, 2024

Fixes #95

  • AWS_ENDPOINT and AWS_REGION are required by lancedb for S3, AWS_ENDPOINT was previously renamed to ENDPOINT_URL.
  • URL images were not correctly handled

@BertrandRenault BertrandRenault self-assigned this Feb 5, 2024
@BertrandRenault BertrandRenault added the bug: minor Minor issues, minimal user impact label Feb 5, 2024
@BertrandRenault BertrandRenault added scope: front Related to Pixano frontend scope: back Related to Pixano backend labels Feb 5, 2024
@cpvannier cpvannier linked an issue Feb 5, 2024 that may be closed by this pull request
* feat(back): Add ann_type to choose between "Pre-annotation" and "Model run"

* fix(ci): Update Pylint local variables limit

* feat(front): Update "Ignore" pre-annotation button to "Reject"

As discussed during the latest sprint demo (Fri 02/02/2024), and for consistency with documentation in inference_model.py and pre_annotation.ipynb

* fix(back): Make ann_type optional

* fix(front): Update Prettier config for 3.2.5

See https://github.com/prettier/prettier/blob/main/CHANGELOG.md#use-json-parser-for-tsconfigjson-by-default-16012-by-sosukesuzuki

* fix(back): Merge ann_type with process_type

* fix(ci): Revert Pylint local variables limit
@BertrandRenault BertrandRenault marked this pull request as ready for review February 5, 2024 15:53
@cpvannier cpvannier added this to the Pixano 0.5.0 milestone Feb 5, 2024
@cpvannier cpvannier changed the title Fix: S3 and URL wrongly handled fix: S3 and URL wrongly handled Feb 6, 2024
@@ -21,3 +21,11 @@ import { schemeSet3 } from "d3-scale-chromatic";
export function ordinalColorScale(range: Iterable<string>) {
return scaleOrdinal(schemeSet3).domain(range);
}

Copy link
Contributor

Choose a reason for hiding this comment

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

in order to better organize utils, there is a dedicated folder core/src/lib/utils. Maybe we could create an index file which would allow to do a utils.fooFunction?

@@ -204,7 +204,11 @@
for (const view of Object.values(selectedItem.views)) {
zoomFactor[view.id] = 1;
images[view.id] = new Image();
images[view.id].src = `/${view.uri}` || view.url;
if (utils.isValidURL(view.uri)) {
images[view.id].src = `${view.uri}` || view.url;
Copy link
Contributor

Choose a reason for hiding this comment

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

I think || view.url was added here during data migration to avoid bugs but should probably not be needed in the future?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

agreed, but in a future PR

@BertrandRenault BertrandRenault merged commit a69ee8e into develop Feb 7, 2024
5 checks passed
cpvannier added a commit that referenced this pull request Feb 15, 2024
* fix(back): AWS_ENDPOINT required by lancedb

* fix(back): protection against incomplete embeddings table

* fix(front): manage correctly url image

* fix(back): typo

* fix(back): incorrect doc param

* chore(back): linting

* feat(back): Choose Pre-annotation or Model run in InferenceModel (#91)

* feat(back): Add ann_type to choose between "Pre-annotation" and "Model run"

* fix(ci): Update Pylint local variables limit

* feat(front): Update "Ignore" pre-annotation button to "Reject"

As discussed during the latest sprint demo (Fri 02/02/2024), and for consistency with documentation in inference_model.py and pre_annotation.ipynb

* fix(back): Make ann_type optional

* fix(front): Update Prettier config for 3.2.5

See https://github.com/prettier/prettier/blob/main/CHANGELOG.md#use-json-parser-for-tsconfigjson-by-default-16012-by-sosukesuzuki

* fix(back): Merge ann_type with process_type

* fix(ci): Revert Pylint local variables limit

---------

Co-authored-by: Corentin Vannier <56968251+cpvannier@users.noreply.github.com>
@cpvannier cpvannier deleted the fix/s3-env-var branch February 20, 2024 15:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug: minor Minor issues, minimal user impact scope: back Related to Pixano backend scope: front Related to Pixano frontend
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fix S3 support
3 participants