fractal-server 2.11.1__py3-none-any.whl → 2.12.0a0__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.11.1"
+__VERSION__ = "2.12.0a0"

fractal_server/app/models/__init__.py

@@ -4,9 +4,7 @@ thus we should always export all relevant database models from here or they
 will not be picked up by alembic.
 """
 from .linkusergroup import LinkUserGroup  # noqa: F401
-from .linkuserproject import LinkUserProject  # noqa: F401
 from .linkuserproject import LinkUserProjectV2  # noqa: F401
 from .security import *  # noqa
 from .user_settings import UserSettings  # noqa
-from .v1 import *  # noqa
 from .v2 import *  # noqa

fractal_server/app/models/linkuserproject.py

@@ -2,15 +2,6 @@ from sqlmodel import Field
 from sqlmodel import SQLModel
 
 
-class LinkUserProject(SQLModel, table=True):
-    """
-    Crossing table between User and Project
-    """
-
-    project_id: int = Field(foreign_key="project.id", primary_key=True)
-    user_id: int = Field(foreign_key="user_oauth.id", primary_key=True)
-
-
 class LinkUserProjectV2(SQLModel, table=True):
     """
     Crossing table between User and ProjectV2

fractal_server/app/routes/aux/_job.py

@@ -1,12 +1,10 @@
 from pathlib import Path
-from typing import Union
 
-from ...models.v1 import ApplyWorkflow
 from ...models.v2 import JobV2
 from ...runner.filenames import SHUTDOWN_FILENAME
 
 
-def _write_shutdown_file(*, job: Union[ApplyWorkflow, JobV2]):
+def _write_shutdown_file(*, job: JobV2):
     """
     Write job's shutdown file.
 

fractal_server/app/runner/filenames.py

@@ -1,4 +1,2 @@
-HISTORY_FILENAME_V1 = "history.json"
-METADATA_FILENAME_V1 = "metadata.json"
 SHUTDOWN_FILENAME = "shutdown"
 WORKFLOW_LOG_FILENAME = "workflow.log"

fractal_server/app/runner/shutdown.py

@@ -3,8 +3,6 @@ import time
 from sqlmodel import select
 
 from fractal_server.app.db import get_async_db
-from fractal_server.app.models.v1 import ApplyWorkflow
-from fractal_server.app.models.v1.job import JobStatusTypeV1
 from fractal_server.app.models.v2 import JobV2
 from fractal_server.app.models.v2.job import JobStatusTypeV2
 from fractal_server.app.routes.aux._job import _write_shutdown_file
@@ -13,9 +11,7 @@ from fractal_server.logger import get_logger
 from fractal_server.syringe import Inject
 
 
-async def cleanup_after_shutdown(
-    *, jobsV1: list[int], jobsV2: list[int], logger_name: str
-):
+async def cleanup_after_shutdown(*, jobsV2: list[int], logger_name: str):
     logger = get_logger(logger_name)
     logger.info("Cleanup function after shutdown")
     stm_v2 = (
@@ -24,22 +20,12 @@ async def cleanup_after_shutdown(
         .where(JobV2.status == JobStatusTypeV2.SUBMITTED)
     )
 
-    stm_v1 = (
-        select(ApplyWorkflow)
-        .where(ApplyWorkflow.id.in_(jobsV1))
-        .where(ApplyWorkflow.status == JobStatusTypeV1.SUBMITTED)
-    )
-
     async for session in get_async_db():
         jobsV2_db = (await session.execute(stm_v2)).scalars().all()
-        jobsV1_db = (await session.execute(stm_v1)).scalars().all()
 
         for job in jobsV2_db:
             _write_shutdown_file(job=job)
 
-        for job in jobsV1_db:
-            _write_shutdown_file(job=job)
-
         settings = Inject(get_settings)
 
         t_start = time.perf_counter()
@@ -49,9 +35,8 @@ async def cleanup_after_shutdown(
             logger.info("Waiting 3 seconds before checking")
             time.sleep(3)
             jobsV2_db = (await session.execute(stm_v2)).scalars().all()
-            jobsV1_db = (await session.execute(stm_v1)).scalars().all()
 
-            if len(jobsV2_db) == 0 and len(jobsV1_db) == 0:
+            if len(jobsV2_db) == 0:
                 logger.info(
                     (
                         "All jobs associated to this app are "
@@ -61,10 +46,7 @@ async def cleanup_after_shutdown(
                 return
             else:
                 logger.info(
-                    (
-                        f"Some jobs are still 'submitted' "
-                        f"{jobsV1_db=}, {jobsV2_db=}"
-                    )
+                    (f"Some jobs are still 'submitted' " f"{jobsV2_db=}")
                 )
         logger.info(
             (
@@ -79,10 +61,4 @@ async def cleanup_after_shutdown(
             session.add(job)
         await session.commit()
 
-        for job in jobsV1_db:
-            job.status = "failed"
-            job.log = (job.log or "") + "\nJob stopped due to app shutdown\n"
-            session.add(job)
-        await session.commit()
-
         logger.info("Exit from shutdown logic")

fractal_server/config.py

@@ -338,7 +338,7 @@ class Settings(BaseSettings):
 
     FRACTAL_API_MAX_JOB_LIST_LENGTH: int = 50
     """
-    Number of ids that can be stored in the `jobsV1` and `jobsV2` attributes of
+    Number of ids that can be stored in the `jobsV2` attribute of
     `app.state`.
     """
 
@@ -496,13 +496,6 @@ class Settings(BaseSettings):
     `JobExecutionError`.
     """
 
-    FRACTAL_API_SUBMIT_RATE_LIMIT: int = 2
-    """
-    Interval to wait (in seconds) to be allowed to call again
-    `POST api/v1/{project_id}/workflow/{workflow_id}/apply/`
-    with the same path and query parameters.
-    """
-
     FRACTAL_RUNNER_TASKS_INCLUDE_IMAGE: str = (
         "Copy OME-Zarr structure;Convert Metadata Components from 2D to 3D"
     )
@@ -511,13 +504,6 @@ class Settings(BaseSettings):
     attribute in their input-arguments JSON file.
     """
 
-    FRACTAL_API_V1_MODE: Literal[
-        "include", "include_read_only", "exclude"
-    ] = "include"
-    """
-    Whether to include the v1 API.
-    """
-
     FRACTAL_PIP_CACHE_DIR: Optional[str] = None
     """
     Absolute path to the cache directory for `pip`; if unset,

fractal_server/main.py

@@ -39,20 +39,11 @@ def collect_routers(app: FastAPI) -> None:
             The application to register the routers to.
     """
     from .app.routes.api import router_api
-    from .app.routes.api.v1 import router_api_v1
     from .app.routes.api.v2 import router_api_v2
-    from .app.routes.admin.v1 import router_admin_v1
     from .app.routes.admin.v2 import router_admin_v2
     from .app.routes.auth.router import router_auth
 
-    settings = Inject(get_settings)
-
     app.include_router(router_api, prefix="/api")
-    if settings.FRACTAL_API_V1_MODE.startswith("include"):
-        app.include_router(router_api_v1, prefix="/api/v1")
-        app.include_router(
-            router_admin_v1, prefix="/admin/v1", tags=["V1 Admin area"]
-        )
     app.include_router(router_api_v2, prefix="/api/v2")
     app.include_router(
         router_admin_v2, prefix="/admin/v2", tags=["V2 Admin area"]
@@ -84,7 +75,6 @@ def check_settings() -> None:
 
 @asynccontextmanager
 async def lifespan(app: FastAPI):
-    app.state.jobsV1 = []
     app.state.jobsV2 = []
     logger = set_logger("fractal_server.lifespan")
     logger.info("Start application startup")
@@ -123,12 +113,11 @@ async def lifespan(app: FastAPI):
 
     logger.info(
         f"Current worker with pid {os.getpid()} is shutting down. "
-        f"Current jobs: {app.state.jobsV1=}, {app.state.jobsV2=}"
+        f"Current jobs: {app.state.jobsV2=}"
     )
     if _backend_supports_shutdown(settings.FRACTAL_RUNNER_BACKEND):
         try:
             await cleanup_after_shutdown(
-                jobsV1=app.state.jobsV1,
                 jobsV2=app.state.jobsV2,
                 logger_name="fractal_server.lifespan",
             )

fractal_server/migrations/versions/1eac13a26c83_drop_v1_tables.py

@@ -0,0 +1,67 @@
+"""Drop V1 tables
+
+Revision ID: 1eac13a26c83
+Revises: af8673379a5c
+Create Date: 2025-01-10 13:17:47.838607
+
+"""
+import logging
+
+from alembic import op
+from sqlmodel import SQLModel
+
+from fractal_server.migrations.naming_convention import NAMING_CONVENTION
+
+# revision identifiers, used by Alembic.
+revision = "1eac13a26c83"
+down_revision = "af8673379a5c"
+branch_labels = None
+depends_on = None
+
+
+TABLES_V1 = [
+    "resource",
+    "applyworkflow",
+    "task",
+    "workflow",
+    "workflowtask",
+    "linkuserproject",
+    "dataset",
+    "project",
+    "state",
+]
+
+
+def upgrade() -> None:
+
+    logger = logging.getLogger("alembic.runtime.migration")
+
+    target_metadata = SQLModel.metadata
+    target_metadata.naming_convention = NAMING_CONVENTION
+
+    connection = op.get_bind()
+    target_metadata.reflect(
+        bind=connection,
+        extend_existing=True,
+        only=TABLES_V1,
+    )
+
+    logger.info("Starting non-reversible upgrade")
+    logger.info("Dropping all V1 ForeignKey constraints")
+    fk_names = []
+    for table_name in TABLES_V1:
+        table = target_metadata.tables[table_name]
+        for fk in table.foreign_keys:
+            op.drop_constraint(fk.name, table_name, type_="foreignkey")
+            fk_names.append(fk.name)
+    logger.info(f"Dropped all V1 ForeignKey constraints: {fk_names}")
+    logger.info(f"Dropping all V1 tables: {TABLES_V1}")
+    for table_name in TABLES_V1:
+        op.drop_table(table_name)
+
+
+def downgrade() -> None:
+    raise RuntimeError(
+        "Cannot downgrade from 1eac13a26c83 to db09233ad13a, "
+        "because it's fully breaking."
+    )

fractal_server/string_tools.py

@@ -33,27 +33,6 @@ def sanitize_string(value: str) -> str:
     return new_value
 
 
-def slugify_task_name_for_source_v1(task_name: str) -> str:
-    """
-    NOTE: this function is used upon creation of tasks' sources, therefore
-    for the moment we cannot replace it with its more comprehensive version
-    from `fractal_server.string_tools.sanitize_string`, nor we can remove it.
-
-    As of 2.3.1, we are renaming it to `slugify_task_name_for_source`, to make
-    it clear that it should not be used for other purposes.
-
-    As of 2.7.0, we are renaming it to `slugify_task_name_for_source_v1`, to
-    make it clear that it is not used for v2.
-
-    Args:
-        task_name:
-
-    Return:
-        Slug-ified task name.
-    """
-    return task_name.replace(" ", "_").lower()
-
-
 def validate_cmd(
     command: str,
     *,

fractal_server/tasks/utils.py

@@ -1,7 +1,5 @@
 from pathlib import Path
 
-from fractal_server.config import get_settings
-from fractal_server.syringe import Inject
 
 COLLECTION_FILENAME = "collection.json"
 COLLECTION_LOG_FILENAME = "collection.log"
@@ -9,31 +7,9 @@ COLLECTION_FREEZE_FILENAME = "collection_freeze.txt"
 FORBIDDEN_DEPENDENCY_STRINGS = ["github.com"]
 
 
-def get_absolute_venv_path_v1(venv_path: Path) -> Path:
-    """
-    If a path is not absolute, make it a relative path of FRACTAL_TASKS_DIR.
-
-    As of v2.7.0, we rename this to v1 since it is only to be used in v1.
-    """
-    if venv_path.is_absolute():
-        package_path = venv_path
-    else:
-        settings = Inject(get_settings)
-        package_path = settings.FRACTAL_TASKS_DIR / venv_path
-    return package_path
-
-
 def get_collection_path(base: Path) -> Path:
     return base / COLLECTION_FILENAME
 
 
 def get_log_path(base: Path) -> Path:
     return base / COLLECTION_LOG_FILENAME
-
-
-def get_collection_log_v1(path: Path) -> str:
-    package_path = get_absolute_venv_path_v1(path)
-    log_path = get_log_path(package_path)
-    with log_path.open("r") as f:
-        log = f.read()
-    return log

{fractal_server-2.11.1.dist-info → fractal_server-2.12.0a0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: fractal-server
-Version: 2.11.1
+Version: 2.12.0a0
 Summary: Backend component of the Fractal analytics platform
 Home-page: https://github.com/fractal-analytics-platform/fractal-server
 License: BSD-3-Clause

{fractal_server-2.11.1.dist-info → fractal_server-2.12.0a0.dist-info}/RECORD

@@ -1,20 +1,13 @@
-fractal_server/__init__.py,sha256=IDMsn_8tp36mX2SfY8u--GT2UfFEEyrK2bOGt3Pg-e0,23
+fractal_server/__init__.py,sha256=Wn8eJa03y-IsDDGndomL0oqMXnAho6QTuQcpQidSwcA,25
 fractal_server/__main__.py,sha256=D2YTmSowmXNyvqOjW_HeItCZT2UliWlySl_owicaZg0,8026
 fractal_server/alembic.ini,sha256=MWwi7GzjzawI9cCAK1LW7NxIBQDUqD12-ptJoq5JpP0,3153
 fractal_server/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/db/__init__.py,sha256=wup2wcOkyOh8Vd0Xm76PZn_naxeMqaL4eF8DHHXTGlI,2889
-fractal_server/app/models/__init__.py,sha256=aG7mf1zZbsgzDSp7GHEcZhdjHfW3TGPOLCI8MrvYhPw,500
+fractal_server/app/models/__init__.py,sha256=xJWiGAwpXmCpnFMC4c_HTqoUCzMOXrakoGLUH_uMvdA,415
 fractal_server/app/models/linkusergroup.py,sha256=LWTUfhH2uAnn_4moK7QdRUIHWtpw-hPZuW-5jClv_OE,610
-fractal_server/app/models/linkuserproject.py,sha256=eQaourbGRshvlMVlKzLYJKHEjfsW1CbWws9yW4eHXhA,567
+fractal_server/app/models/linkuserproject.py,sha256=hvaxh3Lkiy2uUCwB8gvn8RorCpvxSSdzWdCS_U1GL7g,315
 fractal_server/app/models/security.py,sha256=kLvarGwG1CxvtbpV2HkkOobzHU5Ia0PHyNzHghKSEx4,3751
 fractal_server/app/models/user_settings.py,sha256=Y-ZV-uZAFLZqXxy8c5_Qeh_F7zQuZDWOgLpU6Zs6iqU,1316
-fractal_server/app/models/v1/__init__.py,sha256=hUI7dEbPaiZGN0IbHW4RSmSicyvtn_xeuevoX7zvUwI,466
-fractal_server/app/models/v1/dataset.py,sha256=99GDgt7njx8yYQApkImqp_7bHA5HH3ElvbR6Oyj9kVI,2017
-fractal_server/app/models/v1/job.py,sha256=QLGXcWdVRHaUHQNDapYYlLpEfw4K7QyD8TmcwhrWw2o,3304
-fractal_server/app/models/v1/project.py,sha256=JG7b5J9CzVNxua4MaMYpfB57xt2qjbXr5SnR7_oKQ70,819
-fractal_server/app/models/v1/state.py,sha256=m9gMZqqnm3oDpJNJp-Lht4kM7oO7pcEI7sL1g7LFvWU,1043
-fractal_server/app/models/v1/task.py,sha256=uFXam7eu3Ye1Yt7_g7llCzY8BetmDRilsq5hR2C1Zbg,2640
-fractal_server/app/models/v1/workflow.py,sha256=dnY5eMaOe3oZv8arn00RNX9qVkBtTLG-vYdWXcQuyo4,3950
 fractal_server/app/models/v2/__init__.py,sha256=63THGEZQlxWcosGCI74SEvJU7wOoOn1j1byTjf4NFOI,526
 fractal_server/app/models/v2/dataset.py,sha256=RuqTHXWEgs4A3OSk8Pq9DTq9Xr7w1IJNnyXhOzrDiR0,1509
 fractal_server/app/models/v2/job.py,sha256=BMmu5oXdZvN7jEIAMZvQMB3PQBcCYzxn6Qm6HdRWre4,1725
@@ -25,7 +18,6 @@ fractal_server/app/models/v2/workflow.py,sha256=YBgFGCziUgU0aJ5EM3Svu9W2c46AewZO
 fractal_server/app/models/v2/workflowtask.py,sha256=sBnKiEx9KqhprUaZVY6R8lyfCdwRaX8obYm6bXdn6_E,1119
 fractal_server/app/routes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/routes/admin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fractal_server/app/routes/admin/v1.py,sha256=ggJZMeKhRijfVe2h2VzfIcpR15FqkKImANhkTXl0mSk,12908
 fractal_server/app/routes/admin/v2/__init__.py,sha256=KYrw0COmmMuIMp7c6YcYRXah4tEYplCWeROnPK1VTeg,681
 fractal_server/app/routes/admin/v2/job.py,sha256=cbkFIRIIXaWmNsUFI7RAu8HpQ0mWn_bgoxtvWZxr-IA,7624
 fractal_server/app/routes/admin/v2/project.py,sha256=luy-yiGX1JYTdPm1hpIdDUUqPm8xHuipLy9k2X6zu74,1223
@@ -33,15 +25,6 @@ fractal_server/app/routes/admin/v2/task.py,sha256=gShC2EAOYa0qTB69EXTDXz5Y375Qoa
 fractal_server/app/routes/admin/v2/task_group.py,sha256=DncrOAB4q-v3BAmxg35m4EohleriW_FLGE5gpW_Or08,8120
 fractal_server/app/routes/admin/v2/task_group_lifecycle.py,sha256=0e0ZJ_k75TVHaT2o8Xk33DPDSgh-eBhZf-y4y7t-Adg,9429
 fractal_server/app/routes/api/__init__.py,sha256=2IDheFi0OFdsUg7nbUiyahqybvpgXqeHUXIL2QtWrQQ,641
-fractal_server/app/routes/api/v1/__init__.py,sha256=Y2HQdG197J0a7DyQEE2jn53IfxD0EHGhzK1I2JZuEck,958
-fractal_server/app/routes/api/v1/_aux_functions.py,sha256=P9Q48thGH95w0h5cacYoibxqgiiLW4oqZ8rNJ2LIISY,13219
-fractal_server/app/routes/api/v1/dataset.py,sha256=7P2VugyaHDhAhUK2EUDksj7O2SgSxRsR7dMDMQB_dPI,17288
-fractal_server/app/routes/api/v1/job.py,sha256=0jGxvu0xNQnWuov2qnoo9yE7Oat37XbcVn4Ute-UsiE,5370
-fractal_server/app/routes/api/v1/project.py,sha256=3NsdNXLIsE8QiNgKP1Kp1-B0zYG0Zi5HKBzWA0LjlQg,15551
-fractal_server/app/routes/api/v1/task.py,sha256=eW89nMCjpD4G6tHXDo2qGBKqWaPirjH6M3hpdJQhfa0,6528
-fractal_server/app/routes/api/v1/task_collection.py,sha256=5EMh3yhS1Z4x25kp5Iaxalrf7RgJh-XD1nBjrFvgwsg,9072
-fractal_server/app/routes/api/v1/workflow.py,sha256=2T93DuEnSshaDCue-JPmjuvGCtbk6lt9pFMuPt783t8,11217
-fractal_server/app/routes/api/v1/workflowtask.py,sha256=OYYConwJbmNULDw5I3T-UbSJKrbbBiAHbbBeVcpoFKQ,5785
 fractal_server/app/routes/api/v2/__init__.py,sha256=w4c9WzagaVV5d4TWBX5buu5ENk8jf3YftMQYmhavz9Q,2172
 fractal_server/app/routes/api/v2/_aux_functions.py,sha256=NJ6_1biN_hhIEK1w8Vj6XhLmdkQ5kMVd_MX5JC_nHLU,11524
 fractal_server/app/routes/api/v2/_aux_functions_task_lifecycle.py,sha256=c8eqPXdMhc3nIixX50B1Ka5n7LgbOZm2JbEs7lICQ04,6767
@@ -70,11 +53,10 @@ fractal_server/app/routes/auth/register.py,sha256=DlHq79iOvGd_gt2v9uwtsqIKeO6i_G
 fractal_server/app/routes/auth/router.py,sha256=tzJrygXFZlmV_uWelVqTOJMEH-3Fr7ydwlgx1LxRjxY,527
 fractal_server/app/routes/auth/users.py,sha256=kZv-Ls224WBFiuvVeM584LhYq_BLz6HQ9HpWbWQxRRM,7808
 fractal_server/app/routes/aux/__init__.py,sha256=LR4bR7RunHAK6jc9IR2bReQd-BdXADdnDccXI4uGeGY,731
-fractal_server/app/routes/aux/_job.py,sha256=q-RCiW17yXnZKAC_0La52RLvhqhxuvbgQJ2MlGXOj8A,702
+fractal_server/app/routes/aux/_job.py,sha256=XWyWpOObcV55YyK7uzGRlaslmPDCBZy4hiSZBpoa_bg,616
 fractal_server/app/routes/aux/_runner.py,sha256=FdCVla5DxGAZ__aB7Z8dEJzD_RIeh5tftjrPyqkr8N8,895
 fractal_server/app/routes/aux/validate_user_settings.py,sha256=Y8eubau0julkwVYB5nA83nDtxh_7RU9Iq0zAhb_dXLA,2351
 fractal_server/app/runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fractal_server/app/runner/async_wrap_v1.py,sha256=g3opE96OsW-kL_YJVCRFOyHISJt8gQwtUnfJzdZPCOQ,832
 fractal_server/app/runner/components.py,sha256=ZF8ct_Ky5k8IAcrmpYOZ-bc6OBgdELEighYVqFDEbZg,119
 fractal_server/app/runner/compress_folder.py,sha256=HSc1tv7x2DBjBoXwugZlC79rm9GNBIWtQKK9yWn5ZBI,3991
 fractal_server/app/runner/exceptions.py,sha256=_qZ_t8O4umAdJ1ikockiF5rDJuxnEskrGrLjZcnQl7A,4159
@@ -94,22 +76,11 @@ fractal_server/app/runner/executors/slurm/sudo/_subprocess_run_as_user.py,sha256
 fractal_server/app/runner/executors/slurm/sudo/executor.py,sha256=FVgx2mxqCLOhSoH3UTAeNc0BT0eJaxHMglGzGYePGPM,47439
 fractal_server/app/runner/executors/slurm/utils_executors.py,sha256=naPyJI0I3lD-sYHbSXbMFGUBK4h_SggA5V91Z1Ch1Xg,1416
 fractal_server/app/runner/extract_archive.py,sha256=tLpjDrX47OjTNhhoWvm6iNukg8KoieWyTb7ZfvE9eWU,2483
-fractal_server/app/runner/filenames.py,sha256=h4iOHD5z_f1y-bFJL-FXAws7k7SwmBmCr8y28m-EGcY,146
+fractal_server/app/runner/filenames.py,sha256=lPnxKHtdRizr6FqG3zOdjDPyWA7GoaJGTtiuJV0gA8E,70
 fractal_server/app/runner/run_subprocess.py,sha256=c3JbYXq3hX2aaflQU19qJ5Xs6J6oXGNvnTEoAfv2bxc,959
 fractal_server/app/runner/set_start_and_last_task_index.py,sha256=-q4zVybAj8ek2XlbENKlfOAJ39hT_zoJoZkqzDqiAMY,1254
-fractal_server/app/runner/shutdown.py,sha256=I_o2iYKJwzku0L3E85ETjrve3QPECygR5xhhsAo5huM,2910
+fractal_server/app/runner/shutdown.py,sha256=9pfSKHDNdIcm0eY-opgRTi7y0HmvfPmYiu9JR6Idark,2082
 fractal_server/app/runner/task_files.py,sha256=sd_MpJ01C8c9QTO8GzGMidFGdlq_hXX_ARDRhd_YMnI,3762
-fractal_server/app/runner/v1/__init__.py,sha256=VvJFk4agX2X3fQfDcoNmOB2ouNCaQU7dAqaFmpcdP8I,15063
-fractal_server/app/runner/v1/_common.py,sha256=MALqlDwvvniBT_z2cuyEHdiOmzSp9lH4BEGGitFggAQ,21561
-fractal_server/app/runner/v1/_local/__init__.py,sha256=4u5RWwSDlNnhPC4ZRP7OAW8_UVt7K27fHByoFf37ne4,6938
-fractal_server/app/runner/v1/_local/_local_config.py,sha256=hM7SPxR07luXPcXdrWXRpEB2uOyjSSRUdqW3QBKJn9c,3147
-fractal_server/app/runner/v1/_local/_submit_setup.py,sha256=XyBDPb4IYdKEEnzLYdcYteIHWVWofJxKMmQCyRkn5Bc,1509
-fractal_server/app/runner/v1/_local/executor.py,sha256=QrJlD77G6q4WohoJQO7XXbvi2RlCUsNvMnPDEZIoAqA,3620
-fractal_server/app/runner/v1/_slurm/__init__.py,sha256=SsImgL8Agb2Qy98IY8S6N0ZIiXMpZ-eHvFHl7Hlb5tE,10955
-fractal_server/app/runner/v1/_slurm/_submit_setup.py,sha256=KO9c694d318adoPQh9UGwxLkw4fRIgybQ5h7QHQKLXQ,2828
-fractal_server/app/runner/v1/_slurm/get_slurm_config.py,sha256=6pQNNx997bLIfLp0guF09t_O0ZYRXnbEGLktSAcKnic,5999
-fractal_server/app/runner/v1/common.py,sha256=_L-vjLnWato80VdlB_BFN4G8P4jSM07u-5cnl1T3S34,3294
-fractal_server/app/runner/v1/handle_failed_job.py,sha256=R8IsM_ucX0_lqFCly8BYuzf-VAVafE5wj_1JXapnxeQ,4696
 fractal_server/app/runner/v2/__init__.py,sha256=1V4uocFaZQAQ1f01UEV8XjXo_9gNjiWgchsHfsm_TZM,15229
 fractal_server/app/runner/v2/_local/__init__.py,sha256=QnQ9jfqpzShzjp6H7rfVx9Sqp03J1JB6fCpwNx2MDOw,5119
 fractal_server/app/runner/v2/_local/_local_config.py,sha256=9oi209Dlp35ANfxb_DISqmMKKc6DPaMsmYVWbZLseME,3630
@@ -139,16 +110,6 @@ fractal_server/app/schemas/_validators.py,sha256=3dotVxUHWKAmUO3aeoluYDLRKrw1OS-
 fractal_server/app/schemas/user.py,sha256=icjox9gK_invW44Nh_L4CvqfRa92qghyQhmevyg09nQ,2243
 fractal_server/app/schemas/user_group.py,sha256=t30Kd07PY43G_AqFDb8vjdInTeLeU9WvFZDx8fVLPSI,1750
 fractal_server/app/schemas/user_settings.py,sha256=re7ZFS8BLjR9MdIoZNRt2DNPc7znCgDpEYFKr8ZsAZg,2980
-fractal_server/app/schemas/v1/__init__.py,sha256=CrBGgBhoemCvmZ70ZUchM-jfVAICnoa7AjZBAtL2UB0,1852
-fractal_server/app/schemas/v1/applyworkflow.py,sha256=dYArxQAOBdUIEXX_Ejz8b9fBhEYu1nMm6b_Z6_P6TgA,4052
-fractal_server/app/schemas/v1/dataset.py,sha256=DWFCxZjApcKt2M6UJMK0tmejXwUT09vjUULf2D7Y-f0,3293
-fractal_server/app/schemas/v1/dumps.py,sha256=67VXnyLh_0Ufo7rPM2jZ9P9rk0CnYcVAkilx_cLX6sg,1274
-fractal_server/app/schemas/v1/manifest.py,sha256=Yht7guhs0Pcl2U0RMOCbI_UHBZ9YO_YU0H8hxACx3TY,3829
-fractal_server/app/schemas/v1/project.py,sha256=Zxd-AguQQG9z2CfJ_sJh5SB9WcHPFbWpLgP_AhjOyZs,1067
-fractal_server/app/schemas/v1/state.py,sha256=tBXzp_qW2TNNNPBo-AWEaffEU-1GkMBtUoaMgiN_EL0,302
-fractal_server/app/schemas/v1/task.py,sha256=7BxOZ_qoRQ8n3YbQpDvB7VMcxB5fSYQmR5RLIWhuJ5U,3704
-fractal_server/app/schemas/v1/task_collection.py,sha256=uvq9bcMaGD_qHsh7YtcpoSAkVAbw12eY4DocIO3MKOg,3057
-fractal_server/app/schemas/v1/workflow.py,sha256=oRKamLSuAgrTcv3gMMxGcotDloLL2c3NNgPA39UEmmM,4467
 fractal_server/app/schemas/v2/__init__.py,sha256=IT2a6fbRx3rt8h6jri_4gZWzTN9EVXewiWoIuBcZ-xA,2618
 fractal_server/app/schemas/v2/dataset.py,sha256=FKzQyMBAdFo9hnR4HzXQML7VbkM8YlKE4OLKjpo-Pdw,5085
 fractal_server/app/schemas/v2/dumps.py,sha256=Yiyma6pMnEk1c-Ekf0e-IWgM20_R4qWyHuoqfdc6brE,1635
@@ -164,7 +125,7 @@ fractal_server/app/schemas/v2/workflowtask.py,sha256=xjFTmnKuHSetJvN-9k_GTMbPKwP
 fractal_server/app/security/__init__.py,sha256=qn6idYgl-p5HWea0gTVnz4JnkoxGEkmQjPzvKpDWT0I,14035
 fractal_server/app/security/signup_email.py,sha256=DrL51UdTSrgjleynMD5CRZwTSOpPrZ96fasRV0fvxDE,1165
 fractal_server/app/user_settings.py,sha256=OP1yiYKtPadxwM51_Q0hdPk3z90TCN4z1BLpQsXyWiU,1316
-fractal_server/config.py,sha256=9rAzw7OO6ZeHEz-I8NJHuGoHf4xCHxfFLyRNZQD9ytY,27019
+fractal_server/config.py,sha256=fIXjjdczTSBuPphQT6FukE3AwhdfIupsbmR38j3HZ_U,26623
 fractal_server/data_migrations/README.md,sha256=_3AEFvDg9YkybDqCLlFPdDmGJvr6Tw7HRI14aZ3LOIw,398
 fractal_server/data_migrations/tools.py,sha256=LeMeASwYGtEqd-3wOLle6WARdTGAimoyMmRbbJl-hAM,572
 fractal_server/gunicorn_fractal.py,sha256=u6U01TLGlXgq1v8QmEpLih3QnsInZD7CqphgJ_GrGzc,1230
@@ -172,12 +133,13 @@ fractal_server/images/__init__.py,sha256=-_wjoKtSX02P1KjDxDP_EXKvmbONTRmbf7iGVTs
 fractal_server/images/models.py,sha256=t4zcUFmWxhAzGgy7kkxs9Ctq8SAhVs0v910UcXcHIUw,3349
 fractal_server/images/tools.py,sha256=4kfPAFJJnvg7fM-cL0JMx97Dc1Npva_0ghitEji3JUU,3407
 fractal_server/logger.py,sha256=5Z3rfsFwl8UysVljTOaaIvt8Pyp6CVH492ez3jE8WAw,5113
-fractal_server/main.py,sha256=gStLT9Du5QMpc9SyvRvtKU21EKwp-dG4HL3zGHzE06A,4908
+fractal_server/main.py,sha256=1ZesKY3-ML8BVmVRg_r_aNWoaSea1uR3GP0DlunpE5U,4452
 fractal_server/migrations/env.py,sha256=9t_OeKVlhM8WRcukmTrLbWNup-imiBGP_9xNgwCbtpI,2730
 fractal_server/migrations/naming_convention.py,sha256=htbKrVdetx3pklowb_9Cdo5RqeF0fJ740DNecY5de_M,265
 fractal_server/migrations/versions/034a469ec2eb_task_groups.py,sha256=vrPhC8hfFu1c4HmLHNZyCuqEfecFD8-bWc49bXMNes0,6199
 fractal_server/migrations/versions/091b01f51f88_add_usergroup_and_linkusergroup_table.py,sha256=-BSS9AFTPcu3gYC-sYbawSy4MWQQx8TfMb5BW5EBKmQ,1450
 fractal_server/migrations/versions/19eca0dd47a9_user_settings_project_dir.py,sha256=Q1Gj1cJ0UrdLBJ5AXfFK9QpxTtmcv-4Z3NEGDnxOme4,961
+fractal_server/migrations/versions/1eac13a26c83_drop_v1_tables.py,sha256=ok8dl4IkI-dfsyE_NZ8IndjQrnQ_g6CDZo4PwozpIwE,1605
 fractal_server/migrations/versions/316140ff7ee1_remove_usersettings_cache_dir.py,sha256=lANgTox0rz459_yo1Rw7fGCT1qw5sUCUXTLUMc_Bzf8,911
 fractal_server/migrations/versions/4c308bcaea2b_add_task_args_schema_and_task_args_.py,sha256=-wHe-fOffmYeAm0JXVl_lxZ7hhDkaEVqxgxpHkb_uL8,954
 fractal_server/migrations/versions/4cedeb448a53_workflowtask_foreign_keys_not_nullables.py,sha256=Mob8McGYAcmgvrseyyYOa54E6Gsgr-4SiGdC-r9O4_A,1157
@@ -206,16 +168,10 @@ fractal_server/migrations/versions/f384e1c0cf5d_drop_task_default_args_columns.p
 fractal_server/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/ssh/__init__.py,sha256=sVUmzxf7_DuXG1xoLQ1_00fo5NPhi2LJipSmU5EAkPs,124
 fractal_server/ssh/_fabric.py,sha256=lNy4IX1I4We6VoWa4Bz4fUPuApLMSoejpyE6I3jDZeM,22869
-fractal_server/string_tools.py,sha256=XtMNsr5R7GmgzmFi68zkKMedHs8vjGoVMMCXqWhIk9k,2568
+fractal_server/string_tools.py,sha256=niViRrrZAOo0y6pEFI9L_eUYS1PoOiQZUBtngiLc2_k,1877
 fractal_server/syringe.py,sha256=3qSMW3YaMKKnLdgnooAINOPxnCOxP7y2jeAQYB21Gdo,2786
 fractal_server/tasks/__init__.py,sha256=kadmVUoIghl8s190_Tt-8f-WBqMi8u8oU4Pvw39NHE8,23
-fractal_server/tasks/utils.py,sha256=gA9nYAviWKAMJmaF5RtoT2InddU6dCT2qA6fZTYNGO4,1105
-fractal_server/tasks/v1/_TaskCollectPip.py,sha256=ARq5AoHYXH0hziEsb-nFAqbsLA-VIddXOdXL38O6_zA,3746
-fractal_server/tasks/v1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fractal_server/tasks/v1/background_operations.py,sha256=0Zm8TT_RV0BxJCXbruYJCu1eXOkEcHpqnWn_BEe7huw,11829
-fractal_server/tasks/v1/endpoint_operations.py,sha256=NQYvgh-_qEI9YhsLiulfOFPDacCd-rgl3cCbPbkJUA0,5103
-fractal_server/tasks/v1/get_collection_data.py,sha256=5C22jp356rCH5IIC0J57wOu-DCC_kp3B6p68JooN7IM,508
-fractal_server/tasks/v1/utils.py,sha256=HYFyNAyZofmf--mVgdwGC5TJpGShIWIDaS01yRr4HxM,1771
+fractal_server/tasks/utils.py,sha256=iJcfOCU5FAOosj6yEWlHtnvF0PuvaQGGvgdFWbbycYo,376
 fractal_server/tasks/v2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/tasks/v2/local/__init__.py,sha256=9RVItnS7OyLsJOuJjWMCicaky4ASUPQEYD4SzDs0hOE,141
 fractal_server/tasks/v2/local/_utils.py,sha256=EvhmVwYjqaNyDCUMEsTWYOUXLgEwR1xr6bu32apCEI8,2491
@@ -241,8 +197,8 @@ fractal_server/tasks/v2/utils_templates.py,sha256=07TZpJ0Mh_A4lXVXrrH2o1VLFFGwxe
 fractal_server/urls.py,sha256=QjIKAC1a46bCdiPMu3AlpgFbcv6a4l3ABcd5xz190Og,471
 fractal_server/utils.py,sha256=PMwrxWFxRTQRl1b9h-NRIbFGPKqpH_hXnkAT3NfZdpY,3571
 fractal_server/zip_tools.py,sha256=GjDgo_sf6V_DDg6wWeBlZu5zypIxycn_l257p_YVKGc,4876
-fractal_server-2.11.1.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.11.1.dist-info/METADATA,sha256=2-8AQ21JsDrgiHyn28rTFVP8-viNbAJu9rJxBC5z2nA,4562
-fractal_server-2.11.1.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
-fractal_server-2.11.1.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.11.1.dist-info/RECORD,,
+fractal_server-2.12.0a0.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.12.0a0.dist-info/METADATA,sha256=LghysLw-HvU3qdWps85YpkIfYdEYWBMcl0Wc_JygZaQ,4564
+fractal_server-2.12.0a0.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
+fractal_server-2.12.0a0.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.12.0a0.dist-info/RECORD,,

fractal_server/app/models/v1/__init__.py

@@ -1,13 +0,0 @@
-"""
-`models` module
-"""
-from ..linkuserproject import LinkUserProject  # noqa F401
-from .dataset import Dataset  # noqa F401
-from .dataset import Resource  # noqa F401
-from .job import ApplyWorkflow  # noqa F401
-from .job import JobStatusTypeV1  # noqa F401
-from .project import Project  # noqa F401
-from .state import State  # noqa F401
-from .task import Task  # noqa F401
-from .workflow import Workflow  # noqa F401
-from .workflow import WorkflowTask  # noqa F401

fractal_server/app/models/v1/dataset.py

@@ -1,71 +0,0 @@
-from datetime import datetime
-from typing import Any
-from typing import Optional
-
-from sqlalchemy import Column
-from sqlalchemy.ext.orderinglist import ordering_list
-from sqlalchemy.types import DateTime
-from sqlalchemy.types import JSON
-from sqlmodel import Field
-from sqlmodel import Relationship
-from sqlmodel import SQLModel
-
-from ....utils import get_timestamp
-from ...schemas.v1.dataset import _DatasetBaseV1
-from ...schemas.v1.dataset import _ResourceBaseV1
-
-
-class Resource(_ResourceBaseV1, SQLModel, table=True):
-    id: Optional[int] = Field(default=None, primary_key=True)
-    dataset_id: int = Field(foreign_key="dataset.id")
-
-
-class Dataset(_DatasetBaseV1, SQLModel, table=True):
-    """
-    Represent a dataset
-
-    Attributes:
-        id:
-            Primary key
-        project_id:
-            ID of the project the workflow belongs to.
-        meta:
-            Metadata of the Dataset
-        history:
-            History of the Dataset
-        resource_list:
-            (Mapper attribute)
-
-    """
-
-    id: Optional[int] = Field(default=None, primary_key=True)
-    project_id: int = Field(foreign_key="project.id")
-    project: "Project" = Relationship(  # noqa: F821
-        sa_relationship_kwargs=dict(lazy="selectin"),
-    )
-
-    resource_list: list[Resource] = Relationship(
-        sa_relationship_kwargs={
-            "lazy": "selectin",
-            "order_by": "Resource.id",
-            "collection_class": ordering_list("id"),
-            "cascade": "all, delete-orphan",
-        }
-    )
-
-    meta: dict[str, Any] = Field(sa_column=Column(JSON), default={})
-    history: list[dict[str, Any]] = Field(
-        sa_column=Column(JSON, server_default="[]", nullable=False)
-    )
-
-    timestamp_created: datetime = Field(
-        default_factory=get_timestamp,
-        sa_column=Column(DateTime(timezone=True), nullable=False),
-    )
-
-    class Config:
-        arbitrary_types_allowed = True
-
-    @property
-    def paths(self) -> list[str]:
-        return [r.path for r in self.resource_list]