Move function models back in function model file

Author: wvangeit

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

@@ -283,3 +283,31 @@ class FunctionInputsValidationError(Exception):
     def __init__(self, error: str):
         self.errors = error
         super().__init__(f"Function inputs validation failed: {error}")
+
+
+class FunctionJobDB(BaseModel):
+    function_uuid: FunctionID
+    title: str = ""
+    description: str = ""
+    inputs: FunctionInputs
+    outputs: FunctionOutputs
+    class_specific_data: FunctionJobClassSpecificData
+    function_class: FunctionClass
+
+
+class RegisteredFunctionJobDB(FunctionJobDB):
+    uuid: FunctionJobID
+
+
+class FunctionDB(BaseModel):
+    function_class: FunctionClass
+    title: str = ""
+    description: str = ""
+    input_schema: FunctionInputSchema
+    output_schema: FunctionOutputSchema
+    default_inputs: FunctionInputs
+    class_specific_data: FunctionClassSpecificData
+
+
+class RegisteredFunctionDB(FunctionDB):
+    uuid: FunctionID

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

@@ -6,37 +6,13 @@
 import uuid
 
 import sqlalchemy as sa
-from models_library.api_schemas_webserver.functions_wb_schema import (
-    FunctionClass,
-    FunctionID,
-    FunctionInputs,
-    FunctionJobClassSpecificData,
-    FunctionJobID,
-    FunctionOutputs,
-)
-from pydantic import BaseModel
 from sqlalchemy.dialects.postgresql import UUID
 from sqlalchemy.sql import func
 
 from ._common import RefActions
 from .base import metadata
 from .funcapi_functions_table import functions_table
 
-
-class FunctionJobDB(BaseModel):
-    function_uuid: FunctionID
-    title: str = ""
-    description: str = ""
-    inputs: FunctionInputs
-    outputs: FunctionOutputs
-    class_specific_data: FunctionJobClassSpecificData
-    function_class: FunctionClass
-
-
-class RegisteredFunctionJobDB(FunctionJobDB):
-    uuid: FunctionJobID
-
-
 function_jobs_table = sa.Table(
     "funcapi_function_jobs",
     metadata,

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

@@ -6,34 +6,10 @@
 import uuid
 
 import sqlalchemy as sa
-from models_library.api_schemas_webserver.functions_wb_schema import (
-    FunctionClass,
-    FunctionClassSpecificData,
-    FunctionID,
-    FunctionInputs,
-    FunctionInputSchema,
-    FunctionOutputSchema,
-)
-from pydantic import BaseModel
 from sqlalchemy.dialects.postgresql import UUID
 
 from .base import metadata
 
-
-class FunctionDB(BaseModel):
-    function_class: FunctionClass
-    title: str = ""
-    description: str = ""
-    input_schema: FunctionInputSchema
-    output_schema: FunctionOutputSchema
-    default_inputs: FunctionInputs
-    class_specific_data: FunctionClassSpecificData
-
-
-class RegisteredFunctionDB(FunctionDB):
-    uuid: FunctionID
-
-
 functions_table = sa.Table(
     "funcapi_functions",
     metadata,

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

@@ -5,13 +5,15 @@
     Function,
     FunctionClass,
     FunctionClassSpecificData,
+    FunctionDB,
     FunctionID,
     FunctionIDNotFoundError,
     FunctionInputs,
     FunctionInputSchema,
     FunctionJob,
     FunctionJobClassSpecificData,
     FunctionJobCollectionIDNotFoundError,
+    FunctionJobDB,
     FunctionJobID,
     FunctionJobIDNotFoundError,
     FunctionOutputSchema,
@@ -30,8 +32,6 @@
 )
 from models_library.rest_pagination import PageMetaInfoLimitOffset
 from servicelib.rabbitmq import RPCRouter
-from simcore_postgres_database.models.funcapi_function_jobs_table import FunctionJobDB
-from simcore_postgres_database.models.funcapi_functions_table import FunctionDB
 
 from ..rabbitmq import get_rabbitmq_rpc_server
 from . import _functions_repository

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

@@ -13,6 +13,8 @@
     FunctionJobIDNotFoundError,
     FunctionOutputs,
     FunctionOutputSchema,
+    RegisteredFunctionDB,
+    RegisteredFunctionJobDB,
 )
 from models_library.rest_pagination import PageMetaInfoLimitOffset
 from simcore_postgres_database.models.funcapi_function_job_collections_table import (
@@ -23,13 +25,9 @@
     function_job_collections_to_function_jobs_table,
 )
 from simcore_postgres_database.models.funcapi_function_jobs_table import (
-    RegisteredFunctionJobDB,
     function_jobs_table,
 )
-from simcore_postgres_database.models.funcapi_functions_table import (
-    RegisteredFunctionDB,
-    functions_table,
-)
+from simcore_postgres_database.models.funcapi_functions_table import functions_table
 from simcore_postgres_database.utils_repos import (
     get_columns_from_db_model,
     transaction_context,