fractal-server 2.16.5__py3-none-any.whl → 2.16.6__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.16.5"
+__VERSION__ = "2.16.6"

fractal_server/app/models/v2/job.py

@@ -8,9 +8,8 @@ from sqlalchemy.types import DateTime
 from sqlmodel import Field
 from sqlmodel import SQLModel
 
-from ....utils import get_timestamp
-from ...schemas.v2 import JobStatusTypeV2
-from fractal_server.types import AttributeFilters
+from fractal_server.app.schemas.v2 import JobStatusTypeV2
+from fractal_server.utils import get_timestamp
 
 
 class JobV2(SQLModel, table=True):
@@ -57,7 +56,7 @@ class JobV2(SQLModel, table=True):
     log: str | None = None
     executor_error_log: str | None = None
 
-    attribute_filters: AttributeFilters = Field(
+    attribute_filters: dict[str, list[int | float | str | bool]] = Field(
         sa_column=Column(JSONB, nullable=False, server_default="{}")
     )
     type_filters: dict[str, bool] = Field(

fractal_server/app/routes/api/v2/workflow_import.py

@@ -149,7 +149,7 @@ async def _get_task_by_taskimport(
 
     # Filter task groups by version
     final_matching_task_groups = list(
-        filter(lambda tg: tg.version == version, task_groups_list)
+        filter(lambda tg: tg.version == version, matching_task_groups)
     )
 
     if len(final_matching_task_groups) < 1:
@@ -167,10 +167,11 @@ async def _get_task_by_taskimport(
     else:
         logger.info(
             "[_get_task_by_taskimport] "
-            "Found many task groups, after filtering by version."
+            f"Found {len(final_matching_task_groups)} task groups, "
+            "after filtering by version."
         )
         final_task_group = await _disambiguate_task_groups(
-            matching_task_groups=matching_task_groups,
+            matching_task_groups=final_matching_task_groups,
             user_id=user_id,
             db=db,
             default_group_id=default_group_id,

{fractal_server-2.16.5.dist-info → fractal_server-2.16.6.dist-info}/METADATA

@@ -1,12 +1,12 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: fractal-server
-Version: 2.16.5
+Version: 2.16.6
 Summary: Backend component of the Fractal analytics platform
-License: BSD-3-Clause
+License-Expression: BSD-3-Clause
+License-File: LICENSE
 Author: Tommaso Comparin
 Author-email: tommaso.comparin@exact-lab.it
 Requires-Python: >=3.11,<3.14
-Classifier: License :: OSI Approved :: BSD License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -19,7 +19,7 @@ Requires-Dist: fastapi-users[oauth] (>=14,<15)
 Requires-Dist: gunicorn (>=23.0,<24.0)
 Requires-Dist: packaging (>=25.0.0,<26.0.0)
 Requires-Dist: psycopg[binary] (>=3.1.0,<4.0.0)
-Requires-Dist: pydantic (>=2.11.0,<2.12.0)
+Requires-Dist: pydantic (>=2.12.0,<2.13.0)
 Requires-Dist: pydantic-settings (==2.11.0)
 Requires-Dist: python-dotenv (>=1.1.0,<1.2.0)
 Requires-Dist: sqlalchemy[asyncio] (>=2.0.23,<2.1)

{fractal_server-2.16.5.dist-info → fractal_server-2.16.6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=Hfv7cG0-XL4HXFzgAjO3EJo9hyAHfURKZqlS1xXyvho,23
+fractal_server/__init__.py,sha256=HkwgigzT_5V7NQiM48xVfHWQx7re2IPcSZilVlAi1PY,23
 fractal_server/__main__.py,sha256=rkM8xjY1KeS3l63irB8yCrlVobR-73uDapC4wvrIlxI,6957
 fractal_server/alembic.ini,sha256=MWwi7GzjzawI9cCAK1LW7NxIBQDUqD12-ptJoq5JpP0,3153
 fractal_server/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -12,7 +12,7 @@ fractal_server/app/models/v2/__init__.py,sha256=vjHwek7-IXmaZZL9VF0nD30YL9ca4wNc
 fractal_server/app/models/v2/accounting.py,sha256=i-2TsjqyuclxFQ21C-TeDoss7ZBTRuXdzIJfVr2UxwE,1081
 fractal_server/app/models/v2/dataset.py,sha256=P_zy4dPQAqrCALQ6737VkAFk1SvcgYjnslGUZhPI8sc,1226
 fractal_server/app/models/v2/history.py,sha256=CBN2WVg9vW5pHU1RP8TkB_nnJrwnuifCcxgnd53UtEE,2163
-fractal_server/app/models/v2/job.py,sha256=RsJY5B-HBOa2uMJYDefMbe8traBVIbwheAWk4H79EcU,2040
+fractal_server/app/models/v2/job.py,sha256=YYzt3ef2CU1WXFNjlltR3ft2kM9T0Hq8oskSipQSxuM,2042
 fractal_server/app/models/v2/project.py,sha256=XLna1SSKdywdDS3qfcVaGtafyVKMZq6CiLvHOe-AjhU,754
 fractal_server/app/models/v2/task.py,sha256=iBIQB8POQE5MyKvLZhw7jZWlBhbrThzCDzRTcgiAczQ,1493
 fractal_server/app/models/v2/task_group.py,sha256=kMHvCROfQZ6Tl7iEOjM9sXQ0qvFSu6Kkg_5pKeP011Y,4590
@@ -52,7 +52,7 @@ fractal_server/app/routes/api/v2/task_group.py,sha256=An8EAwZDNx53TVnGBhjgeW7RI_
 fractal_server/app/routes/api/v2/task_group_lifecycle.py,sha256=DDwFy9TUchUkRTigPSlA6biZZY0wbb8NAZtdo_XYO7E,12289
 fractal_server/app/routes/api/v2/task_version_update.py,sha256=zBYlyqN0UvCfnkqcg945b5jNMRNjSUKJvBz6IPxC0qo,8236
 fractal_server/app/routes/api/v2/workflow.py,sha256=iTIasNP2I5ovhHafQ2P8JJuImAl41ucy5y64J7FiP3w,10701
-fractal_server/app/routes/api/v2/workflow_import.py,sha256=GUEl8HIFcDZ2XaA93t4W6PYC3ALX2XnJGBHH9Yr8q50,9028
+fractal_server/app/routes/api/v2/workflow_import.py,sha256=fsYnFAOwtOR7u2Hod1ij7i_BQjnA2jv2EKzuSPG_pEc,9083
 fractal_server/app/routes/api/v2/workflowtask.py,sha256=gwFvC-qU4yb-Q5ey30rOD4u3D0-4jlJzBTuq8udqpzc,7930
 fractal_server/app/routes/auth/__init__.py,sha256=fao6CS0WiAjHDTvBzgBVV_bSXFpEAeDBF6Z6q7rRkPc,1658
 fractal_server/app/routes/auth/_aux_auth.py,sha256=UZgauY0V6mSqjte_sYI1cBl2h8bcbLaeWzgpl1jdJlk,4883
@@ -236,8 +236,8 @@ fractal_server/types/validators/_workflow_task_arguments_validators.py,sha256=HL
 fractal_server/urls.py,sha256=QjIKAC1a46bCdiPMu3AlpgFbcv6a4l3ABcd5xz190Og,471
 fractal_server/utils.py,sha256=Vn35lApt1T1J8nc09sAVqd10Cy0sa3dLipcljI-hkuk,2185
 fractal_server/zip_tools.py,sha256=H0w7wS5yE4ebj7hw1_77YQ959dl2c-L0WX6J_ro1TY4,4884
-fractal_server-2.16.5.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.16.5.dist-info/METADATA,sha256=gPfqUHwJy1CdFX2rB3KoegmVJbFJ6JGbCSf52xVeleA,4335
-fractal_server-2.16.5.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-fractal_server-2.16.5.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.16.5.dist-info/RECORD,,
+fractal_server-2.16.6.dist-info/METADATA,sha256=vqheZTD-J5Odoykvs4TC65GTB1K0mmluDxwAmxUnKso,4317
+fractal_server-2.16.6.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+fractal_server-2.16.6.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.16.6.dist-info/licenses/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.16.6.dist-info/RECORD,,

{fractal_server-2.16.5.dist-info → fractal_server-2.16.6.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.3
+Generator: poetry-core 2.2.1
 Root-Is-Purelib: true
 Tag: py3-none-any