moves to models-library

Author: pcrespov

api/specs/web-server/_users.py

@@ -10,7 +10,10 @@
 from models_library.api_schemas_webserver.users import (
     MyProfileGet,
     MyProfilePatch,
+    PermissionGet,
     SearchQueryParams,
+    ThirdPartyToken,
+    TokenCreate,
     UserGet,
 )
 from models_library.api_schemas_webserver.users_preferences import PatchRequestBody
@@ -27,11 +30,6 @@
 )
 from simcore_service_webserver.users._tokens_handlers import _TokenPathParams
 from simcore_service_webserver.users.common._schemas import PreRegisteredUserGet
-from simcore_service_webserver.users.schemas import (
-    PermissionGet,
-    ThirdPartyToken,
-    TokenCreate,
-)
 
 router = APIRouter(prefix=f"/{API_VTAG}", tags=["user"])
 

services/web/server/src/simcore_service_webserver/users/schemas.py renamed to packages/models-library/src/models_library/api_schemas_webserver/schemas.py

@@ -2,6 +2,7 @@
 from datetime import date
 from enum import Enum
 from typing import Annotated, Any, Literal
+from uuid import UUID
 
 from common_library.users_enums import UserStatus
 from pydantic import BaseModel, ConfigDict, Field, ValidationInfo, field_validator
@@ -15,6 +16,51 @@
 from .users_preferences import AggregatedPreferences
 
 
+#
+# TOKENS resource
+#
+class ThirdPartyToken(BaseModel):
+    """
+    Tokens used to access third-party services connected to osparc (e.g. pennsieve, scicrunch, etc)
+    """
+
+    service: str = Field(
+        ..., description="uniquely identifies the service where this token is used"
+    )
+    token_key: UUID = Field(..., description="basic token key")
+    token_secret: UUID | None = None
+
+    model_config = ConfigDict(
+        json_schema_extra={
+            "example": {
+                "service": "github-api-v1",
+                "token_key": "5f21abf5-c596-47b7-bfd1-c0e436ef1107",
+            }
+        }
+    )
+
+
+class TokenCreate(ThirdPartyToken):
+    ...
+
+
+#
+# Permissions
+#
+class Permission(BaseModel):
+    name: str
+    allowed: bool
+
+
+class PermissionGet(Permission, OutputSchema):
+    ...
+
+
+#
+# My Profile
+#
+
+
 class MyProfilePrivacyGet(OutputSchema):
     hide_fullname: bool
     hide_email: bool
@@ -132,6 +178,11 @@ def _validate_user_name(cls, value: str):
         return value
 
 
+#
+# User
+#
+
+
 class SearchQueryParams(BaseModel):
     email: str = Field(
         min_length=3,

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

@@ -3,6 +3,7 @@
 
 import redis.asyncio as aioredis
 from aiohttp import web
+from models_library.api_schemas_webserver.users import Permission, PermissionGet
 from pydantic import BaseModel
 from servicelib.aiohttp import status
 from servicelib.aiohttp.requests_validation import (
@@ -27,7 +28,6 @@
     get_notification_key,
 )
 from .common._schemas import UsersRequestContext
-from .schemas import Permission, PermissionGet
 
 _logger = logging.getLogger(__name__)
 

services/web/server/src/simcore_service_webserver/users/_notifications_handlers.py

@@ -4,14 +4,14 @@
 """
 import sqlalchemy as sa
 from aiohttp import web
+from models_library.api_schemas_webserver.users import ThirdPartyToken, TokenCreate
 from models_library.users import UserID
 from models_library.utils.fastapi_encoders import jsonable_encoder
 from sqlalchemy import and_, literal_column
 
 from ..db.models import tokens
 from ..db.plugin import get_database_engine
 from .exceptions import TokenNotFoundError
-from .schemas import ThirdPartyToken, TokenCreate
 
 
 async def create_token(

services/web/server/src/simcore_service_webserver/users/_tokens.py

@@ -2,6 +2,7 @@
 import logging
 
 from aiohttp import web
+from models_library.api_schemas_webserver.users import TokenCreate
 from pydantic import BaseModel
 from servicelib.aiohttp import status
 from servicelib.aiohttp.requests_validation import (
@@ -17,7 +18,6 @@
 from . import _tokens
 from .common._schemas import UsersRequestContext
 from .exceptions import TokenNotFoundError
-from .schemas import TokenCreate
 
 _logger = logging.getLogger(__name__)
 

services/web/server/src/simcore_service_webserver/users/_tokens_handlers.py

@@ -2,6 +2,7 @@
 
 import sqlalchemy as sa
 from aiohttp import web
+from models_library.api_schemas_webserver.users import Permission
 from models_library.users import GroupID, UserBillingDetails, UserID
 from simcore_postgres_database.models.groups import groups, user_to_groups
 from simcore_postgres_database.models.products import products
@@ -24,7 +25,6 @@
 
 from ..db.plugin import get_asyncpg_engine
 from .exceptions import BillingDetailsNotFoundError
-from .schemas import Permission
 
 _ALL = None
 

services/web/server/src/simcore_service_webserver/users/_users_repository.py

@@ -2,7 +2,7 @@
 
 import pycountry
 from aiohttp import web
-from models_library.api_schemas_webserver.users import UserGet
+from models_library.api_schemas_webserver.users import Permission, UserGet
 from models_library.emails import LowerCaseEmailStr
 from models_library.payments import UserInvoiceAddress
 from models_library.products import ProductName
@@ -15,7 +15,6 @@
 from .common._models import UserCredentialsTuple
 from .common._schemas import PreRegisteredUserGet
 from .exceptions import AlreadyPreRegisteredError
-from .schemas import Permission
 
 _logger = logging.getLogger(__name__)
 

services/web/server/src/simcore_service_webserver/users/_users_service.py

@@ -10,6 +10,7 @@
 
 import pytest
 from faker import Faker
+from models_library.api_schemas_webserver.schemas import ThirdPartyToken
 from models_library.api_schemas_webserver.users import (
     MyProfileGet,
     MyProfilePatch,
@@ -21,7 +22,6 @@
 from servicelib.rest_constants import RESPONSE_MODEL_POLICY
 from simcore_postgres_database.models.users import UserRole
 from simcore_service_webserver.users.common._models import ToUserUpdateDB
-from simcore_service_webserver.users.schemas import ThirdPartyToken
 
 
 @pytest.mark.parametrize(

services/web/server/tests/unit/isolated/test_users_models.py

@@ -17,6 +17,7 @@
 import pytest
 import redis.asyncio as aioredis
 from aiohttp.test_utils import TestClient
+from models_library.api_schemas_webserver.schemas import PermissionGet
 from models_library.products import ProductName
 from pydantic import TypeAdapter
 from pytest_simcore.helpers.assert_checks import assert_status
@@ -36,7 +37,6 @@
 from simcore_service_webserver.users._notifications_handlers import (
     _get_user_notifications,
 )
-from simcore_service_webserver.users.schemas import PermissionGet
 
 
 @pytest.fixture