Move function collections model

Author: wvangeit

packages/models-library/src/models_library/api_schemas_webserver/functions_wb_schema.py

@@ -311,3 +311,12 @@ class FunctionDB(BaseModel):
 
 class RegisteredFunctionDB(FunctionDB):
     uuid: FunctionID
+
+
+class FunctionJobCollectionDB(BaseModel):
+    title: str = ""
+    description: str = ""
+
+
+class RegisteredFunctionJobCollectionDB(FunctionJobCollectionDB):
+    uuid: FunctionJobCollectionID

packages/postgres-database/src/simcore_postgres_database/models/funcapi_function_job_collections_table.py

@@ -6,27 +6,11 @@
 import uuid
 
 import sqlalchemy as sa
-from models_library.api_schemas_webserver.functions_wb_schema import (
-    FunctionJobCollectionID,
-)
-from pydantic import BaseModel
 from sqlalchemy.dialects.postgresql import UUID
 from sqlalchemy.sql import func
 
 from .base import metadata
 
-
-class FunctionJobCollectionDB(BaseModel):
-    """Model for a collection of function jobs"""
-
-    title: str = ""
-    description: str = ""
-
-
-class RegisteredFunctionJobCollectionDB(FunctionJobCollectionDB):
-    uuid: FunctionJobCollectionID
-
-
 function_job_collections_table = sa.Table(
     "funcapi_function_job_collections",
     metadata,

services/web/server/src/simcore_service_webserver/functions/_functions_repository.py

@@ -14,11 +14,11 @@
     FunctionOutputs,
     FunctionOutputSchema,
     RegisteredFunctionDB,
+    RegisteredFunctionJobCollectionDB,
     RegisteredFunctionJobDB,
 )
 from models_library.rest_pagination import PageMetaInfoLimitOffset
 from simcore_postgres_database.models.funcapi_function_job_collections_table import (
-    RegisteredFunctionJobCollectionDB,
     function_job_collections_table,
 )
 from simcore_postgres_database.models.funcapi_function_job_collections_to_function_jobs_table import (