fractal-server 2.16.4a0__tar.gz → 2.16.6__tar.gz

{fractal_server-2.16.4a0 → fractal_server-2.16.6}/PKG-INFO

@@ -1,12 +1,12 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: fractal-server
-Version: 2.16.4a0
+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
@@ -14,18 +14,18 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: alembic (>=1.13.1,<2.0.0)
 Requires-Dist: cryptography (>=46.0.0,<47.0.0)
 Requires-Dist: fabric (>=3.2.2,<3.3.0)
-Requires-Dist: fastapi (>=0.117.0,<0.118.0)
+Requires-Dist: fastapi (>=0.118.0,<0.119.0)
 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-settings (>=2.7.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)
-Requires-Dist: sqlmodel (==0.0.25)
+Requires-Dist: sqlmodel (==0.0.27)
 Requires-Dist: tomli_w (>=1.2.0,<1.3.0)
-Requires-Dist: uvicorn (>=0.29.0,<=0.36.0)
+Requires-Dist: uvicorn (>=0.37.0,<0.38.0)
 Requires-Dist: uvicorn-worker (==0.4.0)
 Project-URL: Documentation, https://fractal-analytics-platform.github.io/fractal-server
 Project-URL: Homepage, https://github.com/fractal-analytics-platform/fractal-server

fractal_server-2.16.6/fractal_server/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "2.16.6"

{fractal_server-2.16.4a0 → fractal_server-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-2.16.4a0 → fractal_server-2.16.6}/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.4a0 → fractal_server-2.16.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fractal-server"
-version = "2.16.4a0"
+version = "2.16.6"
 description = "Backend component of the Fractal analytics platform"
 authors = [
     { name="Tommaso Comparin", email="tommaso.comparin@exact-lab.it" },
@@ -13,15 +13,15 @@ license = "BSD-3-Clause"
 requires-python = ">=3.11,<3.14"
 dependencies = [
     "python-dotenv >=1.1.0,<1.2.0",
-    "fastapi >= 0.117.0, <0.118.0",
-    "sqlmodel == 0.0.25",
+    "fastapi >= 0.118.0, <0.119.0",
+    "sqlmodel == 0.0.27",
     "sqlalchemy[asyncio] >=2.0.23,<2.1",
     "fastapi-users[oauth] >=14,<15",
     "alembic >=1.13.1, <2.0.0",
-    "uvicorn >= 0.29.0, <=0.36.0",
+    "uvicorn >= 0.37.0, <0.38.0",
     "uvicorn-worker == 0.4.0",
-    "pydantic >=2.11.0,<2.12.0",
-    "pydantic-settings >=2.7.0",
+    "pydantic >=2.12.0,<2.13.0",
+    "pydantic-settings ==2.11.0",
     "packaging >= 25.0.0, <26.0.0",
     "fabric >= 3.2.2, <3.3.0",
     "gunicorn >=23.0,<24.0",
@@ -95,7 +95,7 @@ filterwarnings = [
 markers = ["container", "ssh", "fails_on_macos"]
 
 [tool.bumpver]
-current_version = "2.16.4a0"
+current_version = "2.16.6"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

fractal_server-2.16.4a0/fractal_server/__init__.py

@@ -1 +0,0 @@
-__VERSION__ = "2.16.4a0"