fix relative imports

Author: bisgaard-itis

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/webserver/functions/functions.py

@@ -3,8 +3,9 @@
 from models_library.api_schemas_webserver import WEBSERVER_RPC_NAMESPACE
 from models_library.rabbitmq_basic_types import RPCMethodName
 from pydantic import TypeAdapter
-from servicelib.logging_utils import log_decorator
-from servicelib.rabbitmq import RabbitMQRPCClient
+
+from .....logging_utils import log_decorator
+from .....rabbitmq import RabbitMQRPCClient
 
 _logger = logging.getLogger(__name__)
 

services/api-server/src/simcore_service_api_server/api/routes/functions.py

@@ -1,10 +1,11 @@
 from typing import Annotated
 
 from fastapi import APIRouter, Depends
-from simcore_service_api_server.api.dependencies.webserver_rpc import (
+
+from ...services_rpc.wb_api_server import WbApiRpcClient
+from ..dependencies.webserver_rpc import (
     get_wb_api_rpc_client,
 )
-from simcore_service_api_server.services_rpc.wb_api_server import WbApiRpcClient
 
 router = APIRouter()
 

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

@@ -2,7 +2,8 @@
 from fastapi import FastAPI
 from models_library.api_schemas_webserver import WEBSERVER_RPC_NAMESPACE
 from servicelib.rabbitmq import RPCRouter
-from simcore_service_webserver.rabbitmq import get_rabbitmq_rpc_server
+
+from ..rabbitmq import get_rabbitmq_rpc_server
 
 # this is the rpc interface exposed to the api-server
 # this interface should call the service layer

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

@@ -4,9 +4,9 @@
 
 from aiohttp import web
 from models_library.users import UserID
-from simcore_service_webserver.projects.models import ProjectDict
 
 from ..projects import projects_service
+from ..projects.models import ProjectDict
 
 
 # example function
@@ -16,7 +16,6 @@ async def get_project_from_function(
     user_id: UserID,
 ) -> ProjectDict:
 
-    project = await projects_service.get_project_for_user(
+    return await projects_service.get_project_for_user(
         app=app, project_uuid=function_uuid, user_id=user_id
     )
-    return project