Feat/myfiles imports collections by bea777515 · Pull Request #95 · ecotaxa/ecotaxa_back

bea777515 · 2025-02-19T17:02:16Z

new : user "my files" with import addition ( import from user directory, recursive import )
collections : many chnages and projectset functionality (mapping , aggregated fields)
guests : create/update / rights to do necessary for collections

…om projects, add /remove projects from collections

… mypy plugin

…' into feat/myfiles_imports_collections

…and tests

…collections

grololo06

Au vu du volume de code, c'est principalement des remarques esthétiques.

grololo06 · 2025-02-25T09:45:42Z

py/main.py

Il faut changer la version de l'API non?

grololo06 · 2025-02-25T09:51:50Z

QA/py/tests/test_update_prj.py

    assert rsp.json() != ref_json
    assert rsp.json()["comments"] == "New comment"
-    assert rsp.json()["visible"] is False
+    assert rsp.json()["access"]==AccessLevelEnum.PRIVATE.value


J'ai l'impression que le code n'est pas formatté avec black ici.

black plante de temps en temps

corrigé , j'ai enlevé les options

grololo06 · 2025-02-25T09:54:19Z

QA/py/pg_files/upgrade_prod.sql

 COMMIT;

 BEGIN;
+------------Running upgrade a9dd3c62b7b0->647290b6c4fc


C'est un upgrade dans le passé?

la aussi : Running upgrade 565015aa8282 -> dac2d438e6b5

grololo06 · 2025-02-25T09:55:31Z

QA/py/pg_files/upgrade_prod.sql

+UPDATE projects SET access='2' WHERE visible=true AND license!='' AND LOWER(license) NOT LIKE 'copyright';
+
+-- private when copyright or visible=False
+UPDATE projects SET access='0' WHERE visible=false OR LOWER(license) LIKE 'copyright';


Un like sans "%" ?

oui mais pas utile ici

grololo06 · 2025-02-25T10:09:19Z

QA/py/tests/test_v_guest.py

+from tests.credentials import ADMIN_AUTH, USER_AUTH, ORDINARY_GUEST_GUEST_ID
+
+
+# noinspection PyPackageRequirements


On peut virer cette ligne?

grololo06 · 2025-02-25T11:05:08Z

py/DB/Project.py

    rf_models_used = Column(VARCHAR)
    cnn_network_id = Column(VARCHAR(50))
-
+    # to calculate concentration


Un petit mot sur le format en DB? C'est des lignes de texte?

grololo06 · 2025-02-25T11:08:07Z

py/helpers/AppConfig.py

    def get_account_request_url(self) -> Optional[str]:
        # TODO find a way to have multi request url ( list of identified url ???)
-        url = self.parser.get("SERVERURL").strip()
+        url = self.parser.get("SERVERURL" or "").strip()


Un "or" de 2 str je ne comprends pas. C'est pour rendre une default value? get("SERVERURL","") ?

oui default value

grololo06 · 2025-02-25T11:10:18Z

py/main.py

+    - An administrator or user administrator or logged project manager can create a guest.
+    - An ordinary logged user cannot create another guest.
+
+    If back-end configuration for self-creation check is Google reCAPTCHA,


Pas de no_bot dans les paramètres?

les guests ne peuvent s'inscrire que par un manager de projet ou un admin

grololo06 · 2025-02-25T11:11:31Z

py/main.py

+    """
+    **Search for collections.**
+
+    Note: Only manageable collections are returned.


Un peu + d'explication sur 'manageable' serait bien. Par le user courant?

grololo06 · 2025-02-25T11:13:56Z

py/main.py

+    fields: Optional[str] = Query(
+        default="*default",
+        title="Fields",
+        description="Return the default fields (typically used in conjunction with an additional field list). For users list display purpose.",


C'est les mêmes champs que ceux pour trier un peu + haut?

je devrais l'enlever pour l'instant , c'est pour ?fields=

[?fields=**default ou ?fields=**summary ou fields=**all ou ?fields=**default,short_title ] (https://help.tableau.com/current/api/rest_api/en-us/REST/rest_api_concepts_fields.htm)

bea777515 and others added 30 commits December 19, 2024 17:46

v2.6.7.9-beta

62f8cfe

errors in models

db39008

error 'out_file'

835daff

changes in models

3e11b8d

small errors

548c59e

aggregated collection data

c365539

creator_users , fix in get aggregated privs

f111804

changes in model , update partial collection

ae93c7d

collection patch && tests

38e2060

fix some test error

67c428a

modified tests, patch entrypoint for collections, licenses removed fr…

24f33dc

…om projects, add /remove projects from collections

minor change

1bdc55c

Fix : passenv

42d40f6

bug fix

acc7b60

add type for users ( guest and user)

ca5ab94

mandatory commit for tox

4492cfa

tool: allow one-level inheritance in DB models to be checked with our…

8221c64

… mypy plugin

error

104fee2

moved objects

bb1b27c

mod alembic version 78b24e7ba52b

edeeb25

Mod : adapt to mypy constraint

e8028cd

add type to initial users

b9913fb

add initial organization

b8d115c

mod : event

f68d1de

feat(persons): small improvements

a2137a2

Users modifs

8bf0960

organisationin MinUserModel

c6a1e26

test: fix test data load

7e73815

Merge remote-tracking branch 'origin/feat/myfiles_imports_collections…

ecbf598

…' into feat/myfiles_imports_collections

test: typo in data file, person->user discriminator

37cb353

bea777515 added 12 commits January 27, 2025 10:26

Error on organisation name in check

6f5154e

refactor DB.Organization

8ecce78

refactor

29424fa

---

8ad8ecf

guests and users separation - small fixes

b1fd685

Guests tests -fix

acc2603

Merge branch 'master' into feat/myfiles_imports_collections

6f84b94

Guests limit access to guests , tests fix

e0fb377

Fix: alembic upgrade process,formulae for projects - users,organisation

9df18ee

ADD : default formulae value

3952471

MOD : remove license and visible , add access and formulae in models …

f1d39ca

…and tests

MOD : add access and formulae in update_project

596cee7

bea777515 temporarily deployed to Env_for_Actions February 19, 2025 17:02 — with GitHub Actions Inactive

MOD : min status in aggregated , users, guests and organisations for …

5303122

…collections

bea777515 temporarily deployed to Env_for_Actions February 21, 2025 17:12 — with GitHub Actions Inactive

grololo06 reviewed Feb 25, 2025

View reviewed changes

MOD : pull request modifs

85d6b32

bea777515 temporarily deployed to Env_for_Actions February 25, 2025 16:08 — with GitHub Actions Inactive

MOD : version 0.41

344bbd4

bea777515 temporarily deployed to Env_for_Actions February 25, 2025 16:13 — with GitHub Actions Inactive

MOD : version 0.41

0f13233

bea777515 temporarily deployed to Env_for_Actions February 25, 2025 16:13 — with GitHub Actions Inactive

MOD : check short_title and external_id at update

22a2211

bea777515 temporarily deployed to Env_for_Actions February 26, 2025 09:05 — with GitHub Actions Inactive

bea777515 merged commit 7ff284a into master Feb 26, 2025
2 checks passed

		from tests.credentials import ADMIN_AUTH, USER_AUTH, ORDINARY_GUEST_GUEST_ID


		# noinspection PyPackageRequirements

Conversation

bea777515 commented Feb 19, 2025

Uh oh!

grololo06 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants