Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix Docker numpy version#518

Merged
PJEstrada merged 3 commits intomasterfrom
fix-dependencies
Jan 18, 2022
Merged

Fix Docker numpy version#518
PJEstrada merged 3 commits intomasterfrom
fix-dependencies

Conversation

@PJEstrada
Copy link
Contributor

No description provided.

@github-actions
Copy link

github-actions bot commented Jan 18, 2022

Unit Test Results

0 files  ±0  0 suites  ±0   0s ⏱️ ±0s
0 tests ±0  0 ✔️ ±0  0 💤 ±0  0 ±0 

Results for commit a4119ae. ± Comparison against base commit 78ba6fc.

♻️ This comment has been updated with latest results.

@PJEstrada PJEstrada merged commit 15337f5 into master Jan 18, 2022
PJEstrada added a commit that referenced this pull request Feb 10, 2022
* [skip ci] Fix issue with closing dialog

* Add sample of annotation

* Display reviewer's comment when task requires changes

* Fix frontend unit tests

* [skip ci] clean log

* Fix syntax pointed by Pablo

* feat: add new option to file list filters (#479)

Add text and sensor fusion

Co-authored-by: Pablo <[email protected]>

* Feature checker & upgrade button (#466)

* wip: feature checker & upgrade button

* wip:  install id

* wip: integrate plans with feature flags

* feat: add fee tier limit popup and checks on file upload in process media

* feat: enforce limits on project invites

* wip: export blocks

* feat: add free tier limit dialog on export

* feat: added install fingerprint to purchase email

I've removed permissions to new_plan route to be able to receive purchase from anonymous open source users.

Also added  install id to track open source installation that have purchased and track email from users that are using diffgram

* fix: add validation

* fix: spelling ci skip

* fix: e2e tests

* fix: rename flags & remove some env variables

* feat: added default open source plan support

* fix: rename functions and avoid querying DB on process media on premium

* fix: e2e tests

* fix: e2e test

* [skip ci] cleanup

Co-authored-by: Pablo <[email protected]>
Co-authored-by: Anthony Sarkis <[email protected]>

* Fix: SQL issue

psycopg2.errors.InvalidTextRepresentation: invalid input syntax for integer: ""
LINE 1: ...e_updated) VALUES (2, true,  -1, false,  -1,  -1, '',  -1,  ...

* Fix branching case

Assuming branching case was not intentional
restores linear order

* Improve sequence list (#489)

* remove legacy code

1) this is legacy -> default_sequences_to_single_frame
2) Clean comments

* Align new regen function and refactor

1) regenerate_keyframes_for_whole_series()
now makes more sense for case of actually wanting to regen the whole list
2) Clarifies the use case of updating from a single instance
3) Refactors is_keyframe_missing_from_list()
Although as a note here given the `not in list` check, perhaps a try/catch block with the binary search would be more efficient

* add org case and wordsmith

1) org case is intent is to not show message to existing orgs
may need to review if we are assigned default ids
2) Wordsmith to save space on top bar

* Fix branching case

Assuming branching case was not intentional
restores linear order

* clean: remove legacy code  ci skip

hide print statement

* Fix: SQL issue

psycopg2.errors.InvalidTextRepresentation: invalid input syntax for integer: ""
LINE 1: ...e_updated) VALUES (2, true,  -1, false,  -1,  -1, '',  -1,  ...

* Clean and fix missing self

* Fix: Extract keyframe cache to be more composable

1) Split update into declarative add/remove
2) Split the keyframe cache from other sequence work to make it closer to the actual decision point

* Add: skip extra logging for annotation update params

This was an extra logging thing. perhaps could be optional in future.
It information dumps way too much content to be  clearly useful as far as I can tell.

* Improve: Fix logic for when we ignore deletion

* clean ci skip

* Bugfixs: Adding all to all keyframes on front end

1) Now conditions on the action_type of the instance (eg added_instances, or 'deleted')  This replaces refresh_sequence_frame_list()

2) Added deletion context on this front end case
`remove_frame_number_from_sequence`

The benefit of leaning on backend here is that it helps ensure alignment, but the downside is that it's a little clunky. We could instead do this before save

* Clean: ci skip

* Go back to hard error on outdated list - can revert if needed

1) Because this way reproduced further issues with keyframes so far
2) Context of that other ticket where we assumed this was firing

* Switch to current_frame_cache to avoid issues on frame change

otherwise it injects the wrong frame

* Adjust context now that hard check is re-enabled

* Revert "Adjust context now that hard check is re-enabled"

This reverts commit 99fbb01.

* Revert "Go back to hard error on outdated list - can revert if needed"

This reverts commit cd2122a.

* Fix Concurrent Saving Frames Issues (#491)

* fix: add pending save to each instance iteration during paste

This helps preventing the UI to change frame without saving ids. It will keep the pending_changes variable. Still need to implement a way to save all left out pending frames even if the current_frame is not the same.

* fix: merge conflicts

* refactor: renaming function to add_instance_to_file and adding frame 

Moving toward function relying more on the frame number as a parameter, pending UpdateCommands refactor

* fix: added blocks for preventing rapid copy paste.

We now wait for frames to be fully loaded before allowing any type of paste operation.

* fix: unit tests

* fix: unit tests

* fix: fixes in polygon creation and remove frame number from image case

* fix: cuboid ghost instances line dash

* fix: remove this.instance_list cache concept

We now pass the instance list as parameter to keep it in function context.

* fix: e2e test

* fix: autosave on image case

* fix: e2e tests

* test: add unit tests

* test: unit tests

* test: finish unit tests

* fix: add save when changing frames via slider. 

To guarantee saving before resetting the frame buffer dict

* fix: assertion

* wip: refactoring sequence update to support multiple sequences

* fix: add auto increase sequence functionality

* fix: deletion on sequence that have not been saved.

* wip: cleanup

* fix: tests

* fix: e2e tests

Co-authored-by: Pablo <[email protected]>

* fix: console log cleanup [skip ci]

* fix: task serializer (#495)

Co-authored-by: Pablo <[email protected]>

* Fix Frame Changes Bug (#496)

* fix: remove the @input event since it causes double changes of 

In the context of the slider, this event was causing the frame to "regress" to the previous number because it would be triggered every time the frame number changed. I don't see a use of this so removing it to concurrent changes of the frame number thanks to this event handler.

* fix: order page link

Co-authored-by: Pablo <[email protected]>

* [skip ci] Another approach to render text

* [skip ci] Add handdrawing labels

* [skip ci] Add hover effect

* [skip ci] Start intersection algorithm

* [skip ci] Update lines when intersections appear

* [skip ci] Improve multi level rebdering

* [skip ci] Add text to the labels render

* [skip ci] Predict creation of overlaying labels

* Rehash Existing Instances to Prevent Instance History Corruption (#497)

* wip: initial test case setup

* wip: dummy hash

* fix: added rehash algorithm to prevent instance history corruption

* fix: e2e tests

* fix: add default values and unit tests for rehashing algorithm

* fix: case of instance appearing restored when saving with no changes

Main issue was that we were not considering the is_new_instance on the check for a restore case.

* fix: add to session only if hash changed

* fix: change from warning to info

Co-authored-by: Pablo <[email protected]>

* Add proactive frame fetching to video player (#503)

* feat: add proactive frame fetching to video player

Now images are getting fetched proactively on the buffer to avoid users waiting for networks requests.

* cleanup

* fix: unit tests

Co-authored-by: Pablo <[email protected]>

* [skip ci] Modify rects render algorithm

* [skip ci] Finish algorithm for drawing instances without overlays and moving text string simuptangeously

* [skip ci] Rename label to instance as Pablo suggested

* [skip ci] Fix one more overlay case

* [skip ci] Improve hover effect

* [skip ci] Add type to instance

* [skip ci] Add relation drawing path

* [skip ci] Add relation rednering

* [skip ci] Preoritize relation render on the top

* [skip ci] Add relation hover effect

* fix: add support for uploading csv with a list of urls (#509)

The upload wizard and walrus was not updated to support this feature based on new functionality

Co-authored-by: Pablo <[email protected]>

* Bump pillow from 8.3.2 to 9.0.0 in /walrus (#499)

Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.3.2 to 9.0.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](python-pillow/Pillow@8.3.2...9.0.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump pillow from 8.3.2 to 9.0.0 in /default (#500)

Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.3.2 to 9.0.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](python-pillow/Pillow@8.3.2...9.0.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix: remove hard delete and improve layouts (#506)

Co-authored-by: Pablo <[email protected]>

* fix: allow batched uploads with S3 Connector (#507)

Co-authored-by: Pablo <[email protected]>

* fix: crash on task context (#508)

UI Schema was missing some conditions for task context.

Co-authored-by: Pablo <[email protected]>

* Build(deps-dev): Bump shelljs from 0.8.4 to 0.8.5 in /frontend (#510)

Bumps [shelljs](https://github.com/shelljs/shelljs) from 0.8.4 to 0.8.5.
- [Release notes](https://github.com/shelljs/shelljs/releases)
- [Changelog](https://github.com/shelljs/shelljs/blob/master/CHANGELOG.md)
- [Commits](shelljs/shelljs@v0.8.4...v0.8.5)

---
updated-dependencies:
- dependency-name: shelljs
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* [skip ci] Add wink tokenizer

* build(deps): bump numpy from 1.20.2 to 1.21.0 in /default (#513)

Bumps [numpy](https://github.com/numpy/numpy) from 1.20.2 to 1.21.0.
- [Release notes](https://github.com/numpy/numpy/releases)
- [Changelog](https://github.com/numpy/numpy/blob/main/doc/HOWTO_RELEASE.rst.txt)
- [Commits](numpy/numpy@v1.20.2...v1.21.0)

---
updated-dependencies:
- dependency-name: numpy
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Build(deps): Bump follow-redirects from 1.14.5 to 1.14.7 in /frontend (#511)

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.5 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](follow-redirects/follow-redirects@v1.14.5...v1.14.7)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps): bump numpy from 1.19.2 to 1.21.0 in /walrus (#512)

Bumps [numpy](https://github.com/numpy/numpy) from 1.19.2 to 1.21.0.
- [Release notes](https://github.com/numpy/numpy/releases)
- [Changelog](https://github.com/numpy/numpy/blob/main/doc/HOWTO_RELEASE.rst.txt)
- [Commits](numpy/numpy@v1.19.2...v1.21.0)

---
updated-dependencies:
- dependency-name: numpy
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* [skip ci] Create text Insance calss

* [skip ci] Add toolbar component

* [skip ci] Add item to the toolbar

* fix: dependencies numpy

* fix: default versions

* Fix Docker numpy version (#518)

* fix: versions

* fix: version

Co-authored-by: Pablo <[email protected]>

* [skip ci] Wire up instances to the command manager

* [skip ci] Implement undo functionality

* [skip ci] Add redo command

* [skip ci] Adjust layout

* [skip ci] Wire up relation to the comamnd hanlder

* [skip ci] Fix realtion drawing path

* [skip ci] Add hover effect

* [skip ci] Wire up labels to the text instances

* [skip ci] Add enabling/disabling undo/redo buttons

* [skip ci] Add small formating to the code

* [skip ci] Fix file signed urls (by Pablo)

* [skip ci] Get text from the file instead from the temporary placeholder

* [skip ci] Add buttons to the toolbar for the text interface

* [skip ci] Create side insatnce panel

* [skip ci] Move updating url parameters to the ui factory instaed keeping it in the anootation_core

* DAD-1 Instance Relations Backend Support (#521)

* wip: created model

* wip: alembic and tests serialize

* wip: instance relations

* wip: add create relations

* wip: tests

* feat: add tests and handle relations for instances with no ids

* test: add unit tests for creation

* test: unit tests for updating relations

* test: add tests for update prev relations and remove relations

* fix: requirements

Co-authored-by: Pablo <[email protected]>

* Add Text Tokenizer Columns (#525)

* wip: created model

* wip: alembic and tests serialize

* wip: instance relations

* wip: add create relations

* wip: tests

* feat: add tests and handle relations for instances with no ids

* test: add unit tests for creation

* test: unit tests for updating relations

* test: add tests for update prev relations and remove relations

* fix: requirements

* merge

* feat: add support for text tokenizer setting

Co-authored-by: Pablo <[email protected]>

* [skip ci] Wire up text interface to backend

* fix: set min max to 0 for text tokens

* [skip ci] Create save function

* [skip ci] Add get insatcnes service

* [skip ci] Implement change visisblity of thee labels

* build(deps): bump follow-redirects from 1.14.5 to 1.14.7 in /frontend (#527)

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.5 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](follow-redirects/follow-redirects@v1.14.5...v1.14.7)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix: increase default frame buffer size (#530)

From 15 to 30 frames in parallel

Co-authored-by: Pablo <[email protected]>

* [skip ci] Add update of the text instance

* feat: add text tokenizer feature to backend

Now backend tokenizes text on upload and stores it on blob storage.

* [skip ci] Add label changin to the relations

* [skip ci] Wire up saving label instances

* [skip ci] Add start and end tokens to instance serializer

* [skip ci] Fix save bug

* [skip ci] Refresh data on file change

* [skip ci] Fix backend to allow save relations

* Relations Improvements (#533)

* build(deps): bump follow-redirects from 1.14.5 to 1.14.7 in /frontend (#527)

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.5 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](follow-redirects/follow-redirects@v1.14.5...v1.14.7)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix: increase default frame buffer size (#530)

From 15 to 30 frames in parallel

Co-authored-by: Pablo <[email protected]>

* feat: refactor relations to instance type

* fix: alembic migrations

* test: add unit tests

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Pablo <[email protected]>

* [skip ci] Pre populate the relations

* [skip ci] fix text rendering update bug

* cleanup [skip ci]

* DAD-26 Add Tokens to Export (#537)

* Auto stash before merge of "text-interface-v2" and "origin/text-interface-v2"

* feat: add tokens to export and relations list

Co-authored-by: Pablo <[email protected]>

* [skip ci] Fix undo redo bug

* [skip ci] Implement change file for text interface

* [skip ci] Add top border to the toolbar

* [skip ci] Improve interface of the sidebar

* [skip ci] Fix undo/redo bug for updating labels

* [skip ci] Add delete instance function

* reset changes

* Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 4ee98fe.

* [skip ci] Fix one of the command pattern bugs

* [skip ci] Make insatnce list full size

* [skip ci] Add text_tokenizer list to the instance and spec list

* fix: change tokenizer data structure

use dicts instead of strings

* [skip ci] Fix save multiline relation saveing bug

* [skip ci] Reset command manager when text token is being deleted and has linked relations to it

* [skip ci] Reset command manager when label os the text_token is being updated and it has linked relations to it

* [skip ci] Add markers renders at the start and the end of the relations

* [skip ci] Update tokenizer to use back end one and remove wink tokenizer dependencie

* [skip ci] Add method to check direction of the relation

* [skip ci] Fix arrow position if there is a scroll of the page

* [skip ci] Make height of svg bigger to make sure text will fit

* [skip ci] Predict arrow frinzing pointed in Anthone's video

* [skip ci] Fix repeated key error in the console

* [skip ci] Predict select when the relation is being drawn

* [skip ci] Remove hover after instance is deleted

* [skip ci] Add loading state

* [skip ci] Render IDs only for super admins for now

* [skip ci] Add autosave function as it is on the another interface

* [skip ci] Fix freezing arrow case

* [skip ci] Add Hotkeys component

* [skip ci] Add one more of arrow freezing bug

* [skip ci] Add event listener for the hotkeys

* [skip ci] Remove listeners ifbefore setting them

* Default file level options - WIP (#289)

* Add is_global concept WIP

* Fix typo and simplify

* Create alembic_2021_09_14_12_01_e1739d7f895f_add_global_attributes.py

* Update attribute_template_group.py

* opinon, the ID is more of a super admin thing

but the instance counts could be for all
another option would be to use label_settings to enable or disable IDs
in context of non-expert users like Drs etc IDs maybe not what we want

* basic idea of initializing global instances

* add global UI rendering

remove unused import (axios)

* transmit global instances

* transmit updates to parent

* add value here to pass type checking on save

for now it seems better to do this than reconsider the label_file_id for the defualt case. but this is a stop gap probably

* allow globals to save

small refactor to make deduct_spatial_coordinates() easier to read
and easier to think about with global

* handle global case

* add assumed data. create throw to handle this specific case

* better to do this here

We still set it to None later to avoid foreign key violations
Not saying this is a good way to do it!
I also didn't want to mutate the spec list, to ensure the normal instances are checked properly

* opinon, I think the text here was confusing more than helpling

I think I added this a while ago when we were trying to "Declare" each part of the interface.
As we keep improving the design the text here starts to confuse more than it helps. This is valuable space, especially as more attributes, globals etc

* move into expansion panels - a work in progress

* Clean further

* Merge fix, align with master

* Fix: Out of order DB revision

* Handle a case with resetting the name

Context that we want a local copy for being able to edit the name
but we aren't getting the job data from this component
Not saying this is ideal but should work for now

* Fix merge

and clean old comments

* fix merge and clean

* wip: wizard

* feat: refactor relations to instance type

* fix: alembic migrations

* test: add unit tests

* feat: add wizard step for global attributes and improve layouts

* feat: save global attributes and display them

* fix: alembic migrations

* feat: allow global attributes in video.

* fix: unit tests

* fix: e2e tests

* [ ci skip ]  Hide ROI calculator

So hide until we have time to update it

* Improve: Decrease button area

Before clickable area was expanding to fill entire thing. In the full page view mode this took up a lot of space. Now is expected icon size.

* Clean: Old comments

* Improve: Use header to enable expansion usage

-> This way the show/hide of file level attributes is fully enabled
-> Remove open becuase it was causing an error, whenever another accordion was opened, it would pop open again. As far as I can tell it works fine without it (once opened it stays open for users session), and if we do want it then need a deeper implementation ( was a console error too).

* Improve: Move attributes into accordion and enable for instances

-> Follows pattern from new global attributes
-> Enable existing panel for annotations by add header in default case.
-> Move counts into header, more we can probably do here in future

* clean

* Add: Missing variable relevant in new accordion case

* Add: Icons and fix spacing

* Improve: move to standard expansion panel

-> Not sure why was using a manual open /close before
-> This aligns styles better
-> Including click box aligning with the other items

* Wordsmith: Adjust explanation

-> Also restore the "What Labels Are Attached" to " When Do You Want to Show This?" .  guessing a merge conflict

* fix: styles

* Clean: Logs and formatting [ ci skip ]

* [ci skip]  Add: Only show if there are global attributes

* Restore: Add files to query

Unless this is breaking something - but I think it's nice to have

* fix: unit tests

* fix: e2e tests

* fix: e2e tests

* fix: reduce parallel runners

* fix: tests

Co-authored-by: Pablo <[email protected]>
Co-authored-by: PJEstrada <[email protected]>

* [skip ci] Fix error message for the backend

* test: add test cases from creation refs

* fix: fix error message

* [skip ci] Wire up instance creation by refs

* [skip ci] Predict interface freezing on save if instance drawing in progress

* [skip ci] Initialize drawing relation from clicking on the box

* [skip ci] Add new indicator to the sidebar insatnce list

* [skip ci] Add close confirmation if something is not saved

* [skip ci] Fix labele update for the relation

* [skip ci] Fix deletion of the relations

* [skip ci] Get rid of the props related console errors

* [skip ci] Get rid os the arrow drawing console error

* [skip ci] Predict app from crushin if there are some probelms with relation

* [skip ci] Add crashing defence for the all teh instances types

* [skip ci] Do not draw broken labels

* [skip ci] Disallow to select labels text

* [skip ci] Move g element that top tag is not hidden

* [skip ci] fix draw relation path

* [skip ci] Fix project string id

* [skip ci] Fix bug of clicking below next token

* [skip ci] fix buf of randome creating text tokens while drawing relations

* Auto stash before merge of "text-interface-v2" and "origin/text-interface-v2"

* [skip ci] Fix bug of not drawing insatance from the first word

* [skip ci] Pridct drawing relation to the same word

* [skip ci] Forgib drawing replicated relations

* [skip ci] Add text rendering to the task context

* [skip ci] Add toolbar layout for the task context of the text interface

* [skip ci] Replace buttons on the text toolbar

* [skip ci] Wire up get and post instances functions of the text interface to the task context

* [skip ci] Wire up change task buttons

* [skip ci] Wire up defer task

* [skip ci] Wire up complete task function

* feat: add text task icon

* fix: unit tests

* [skip ci] Fix bug of the draw relation arrow be out othe cursor

* [skip ci] Fix random text_instances bug

* [skip ci] Get rid of console errors

* Comment out qa slideshow button and test for it

* Comment put unit tests related to qa carousel

* fix: member selection test

* Revert "fix: member selection test"

This reverts commit 8a1150a.

Co-authored-by: Vitalii Bulyzhyn <[email protected]>
Co-authored-by: Pablo <[email protected]>
Co-authored-by: PJEstrada <[email protected]>
Co-authored-by: Anthony Sarkis <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@PJEstrada PJEstrada deleted the fix-dependencies branch March 31, 2022 16:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant