Merge branch 'main' into feature_pre_commit_refactoring

Author: IgorChvyrov-sm

src/conductor/asyncio_client/adapters/api/application_resource_api.py

@@ -1,4 +1,103 @@
+from typing import List
+
+from pydantic import StrictStr
+
 from conductor.asyncio_client.http.api import ApplicationResourceApi
+from conductor.asyncio_client.http.models import Tag
+
+
+class ApplicationResourceApiAdapter(ApplicationResourceApi):
+    async def create_access_key(
+        self,
+        id: StrictStr,
+        *args,
+        **kwargs,
+    ):
+        # Convert empty application id to None to prevent sending invalid data to server
+        if not id:
+            id = None
+        return await super().create_access_key(id=id, *args, **kwargs)
+
+    async def add_role_to_application_user(
+        self, application_id: StrictStr, role: StrictStr, *args, **kwargs
+    ):
+        # Convert empty application_id and role to None to prevent sending invalid data to server
+        if not application_id:
+            application_id = None
+        if not role:
+            role = None
+        return await super().add_role_to_application_user(
+            application_id=application_id, role=role, *args, **kwargs
+        )
+
+    async def delete_access_key(
+        self,
+        application_id: StrictStr,
+        key_id: StrictStr,
+        *args,
+        **kwargs,
+    ):
+        # Convert empty application_id and key_id to None to prevent sending invalid data to server
+        if not application_id:
+            application_id = None
+        if not key_id:
+            key_id = None
+        return await super().delete_access_key(
+            application_id=application_id, key_id=key_id, *args, **kwargs
+        )
+
+    async def remove_role_from_application_user(
+        self,
+        application_id: StrictStr,
+        role: StrictStr,
+        *args,
+        **kwargs,
+    ):
+        # Convert empty application_id and role to None to prevent sending invalid data to server
+        if not application_id:
+            application_id = None
+        if not role:
+            role = None
+        return await super().remove_role_from_application_user(
+            application_id=application_id, role=role, *args, **kwargs
+        )
+
+    async def get_app_by_access_key_id(self, access_key_id: StrictStr, *args, **kwargs):
+        # Convert empty access_key_id to None to prevent sending invalid data to server
+        if not access_key_id:
+            access_key_id = None
+        return await super().get_app_by_access_key_id(access_key_id=access_key_id, *args, **kwargs)
+
+    async def get_access_keys(self, id: StrictStr, *args, **kwargs):
+        # Convert empty application id to None to prevent sending invalid data to server
+        if not id:
+            id = None
+        return await super().get_access_keys(id=id, *args, **kwargs)
+
+    async def toggle_access_key_status(
+        self, application_id: StrictStr, key_id: StrictStr, *args, **kwargs
+    ):
+        # Convert empty application_id and key_id to None to prevent sending invalid data to server
+        if not application_id:
+            application_id = None
+        if not key_id:
+            key_id = None
+        return await super().toggle_access_key_status(
+            application_id=application_id, key_id=key_id, *args, **kwargs
+        )
 
+    async def get_tags_for_application(self, application_id: StrictStr, *args, **kwargs):
+        # Convert empty application_id to None to prevent sending invalid data to server
+        if not application_id:
+            application_id = None
+        return await super().get_tags_for_application(id=application_id, *args, **kwargs)
 
-class ApplicationResourceApiAdapter(ApplicationResourceApi): ...
+    async def delete_tag_for_application(
+        self, id: StrictStr, tag: List[Tag], *args, **kwargs
+    ) -> None:
+        # Convert empty application id and tag list to None to prevent sending invalid data to server
+        if not id:
+            id = None
+        if not tag:
+            tag = None
+        return await super().delete_tag_for_application(id=id, tag=tag, *args, **kwargs)

src/conductor/asyncio_client/adapters/api/user_resource_api.py

@@ -1,4 +1,51 @@
+from pydantic import StrictStr
+
 from conductor.asyncio_client.http.api import UserResourceApi
+from conductor.asyncio_client.adapters.models import UpsertUserRequestAdapter as UpsertUserRequest
+
+
+class UserResourceApiAdapter(UserResourceApi):
+    async def get_granted_permissions(
+        self,
+        user_id: StrictStr,
+        *args,
+        **kwargs,
+    ) -> object:
+        # Convert empty user_id to None to prevent sending invalid data to server
+        if not user_id:
+            user_id = None
+        return await super().get_granted_permissions(user_id=user_id, *args, **kwargs)
+
+    async def get_user(
+        self,
+        id: StrictStr,
+        *args,
+        **kwargs,
+    ) -> object:
+        # Convert empty user id to None to prevent sending invalid data to server
+        if not id:
+            id = None
+        return await super().get_user(id=id, *args, **kwargs)
 
+    async def upsert_user(
+        self,
+        id: StrictStr,
+        upsert_user_request: UpsertUserRequest,
+        *args,
+        **kwargs,
+    ) -> object:
+        # Convert empty user id to None to prevent sending invalid data to server
+        if not id:
+            id = None
+        return await super().upsert_user(id=id, upsert_user_request=upsert_user_request, *args, **kwargs)
 
-class UserResourceApiAdapter(UserResourceApi): ...
+    async def delete_user(
+        self,
+        id: StrictStr,
+        *args,
+        **kwargs,
+    ) -> object:
+        # Convert empty user id to None to prevent sending invalid data to server
+        if not id:
+            id = None
+        return await super().delete_user(id=id, *args, **kwargs)

src/conductor/asyncio_client/adapters/models/conductor_user_adapter.py

@@ -2,6 +2,7 @@
 
 from typing import Any, Dict, List, Optional
 
+from pydantic import Field, StrictBool
 from typing_extensions import Self
 
 from conductor.asyncio_client.http.models import ConductorUser
@@ -10,6 +11,9 @@
 class ConductorUserAdapter(ConductorUser):
     groups: Optional[List["GroupAdapter"]] = None
     roles: Optional[List["RoleAdapter"]] = None
+    orkes_app: Optional[StrictBool] = Field(default=None, alias="orkesApp")
+    orkes_api_gateway: Optional[StrictBool] = Field(default=None, alias="orkesApiGateway")
+    contact_information: Optional[Dict[Any, str]] = Field(default=None, alias="contactInformation")
 
     @classmethod
     def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
@@ -39,12 +43,19 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
                     else None
                 ),
                 "uuid": obj.get("uuid"),
+                "orkesApp": obj.get("orkesApp"),
+                "orkesApiGateway": obj.get("orkesApiGateway"),
+                "contactInformation": obj.get("contactInformation"),
             }
         )
         return _obj
 
 
-from conductor.asyncio_client.adapters.models.group_adapter import GroupAdapter  # noqa: E402
-from conductor.asyncio_client.adapters.models.role_adapter import RoleAdapter  # noqa: E402
+from conductor.asyncio_client.adapters.models.group_adapter import (  # noqa: E402
+    GroupAdapter,
+)
+from conductor.asyncio_client.adapters.models.role_adapter import (  # noqa: E402
+    RoleAdapter,
+)
 
 ConductorUserAdapter.model_rebuild(raise_errors=False)

src/conductor/asyncio_client/orkes/orkes_authorization_client.py

@@ -2,6 +2,7 @@
 
 from typing import List
 
+from conductor.asyncio_client.adapters import ApiClient
 from conductor.asyncio_client.adapters.models.authorization_request_adapter import (
     AuthorizationRequestAdapter as AuthorizationRequest,
 )
@@ -11,24 +12,23 @@
 from conductor.asyncio_client.adapters.models.extended_conductor_application_adapter import (
     ExtendedConductorApplicationAdapter as ExtendedConductorApplication,
 )
-from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter as Tag
+from conductor.asyncio_client.adapters.models.granted_access_adapter import (
+    GrantedAccessAdapter as GrantedAccess,
+)
 from conductor.asyncio_client.adapters.models.group_adapter import GroupAdapter as Group
+from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter as Tag
+from conductor.asyncio_client.adapters.models.target_ref_adapter import (
+    TargetRefAdapter as TargetRef,
+)
 from conductor.asyncio_client.adapters.models.upsert_group_request_adapter import (
     UpsertGroupRequestAdapter as UpsertGroupRequest,
 )
 from conductor.asyncio_client.adapters.models.upsert_user_request_adapter import (
     UpsertUserRequestAdapter as UpsertUserRequest,
 )
-from conductor.asyncio_client.adapters import ApiClient
 from conductor.asyncio_client.configuration.configuration import Configuration
 from conductor.asyncio_client.orkes.orkes_base_client import OrkesBaseClient
 from conductor.client.orkes.models.access_key import AccessKey
-from conductor.asyncio_client.adapters.models.target_ref_adapter import (
-    TargetRefAdapter as TargetRef,
-)
-from conductor.asyncio_client.adapters.models.granted_access_adapter import (
-    GrantedAccessAdapter as GrantedAccess,
-)
 
 
 class OrkesAuthorizationClient(OrkesBaseClient):
@@ -51,7 +51,6 @@ async def update_user(
     async def get_user(self, user_id: str) -> ConductorUser:
         """Get user by ID"""
         user = await self.user_api.get_user(id=user_id)
-        print(user)
 
         return ConductorUser.from_dict(user)
 
@@ -186,7 +185,7 @@ async def get_application_tags(self, application_id: str) -> List[Tag]:
         return await self.application_api.get_tags_for_application(application_id)
 
     async def delete_application_tags(self, tags: List[Tag], application_id: str):
-        await self.application_api.delete_tag_for_application(tags, application_id)
+        await self.application_api.delete_tag_for_application(application_id, tags)
 
     async def create_access_key(self, application_id: str) -> AccessKey:
         key_obj = await self.application_api.create_access_key(application_id)
@@ -226,3 +225,11 @@ async def get_granted_permissions_for_user(self, user_id: str) -> List[GrantedAc
             access = ga["access"]
             granted_permissions.append(GrantedAccess(target=target, access=access))
         return granted_permissions
+
+    async def get_app_by_access_key_id(
+        self, access_key_id: str, *args, **kwargs
+    ) -> ExtendedConductorApplication:
+        application_access_key_obj = await self.application_api.get_app_by_access_key_id(
+            access_key_id, *args, **kwargs
+        )
+        return ExtendedConductorApplication.from_dict(application_access_key_obj)

src/conductor/client/adapters/api/application_resource_api_adapter.py

@@ -1,4 +1,67 @@
 from conductor.client.codegen.api.application_resource_api import ApplicationResourceApi
 
 
-class ApplicationResourceApiAdapter(ApplicationResourceApi): ...
+class ApplicationResourceApiAdapter(ApplicationResourceApi):
+    def create_access_key(self, id, **kwargs):
+        # Convert empty application id to None to prevent sending invalid data to server
+        if not id:
+            id = None
+        return super().create_access_key(id, **kwargs)
+
+    def add_role_to_application_user(self, application_id, role, **kwargs):
+        # Convert empty application_id and role to None to prevent sending invalid data to server
+        if not application_id:
+            application_id = None
+        if not role:
+            role = None
+        return super().add_role_to_application_user(application_id, role, **kwargs)
+
+    def delete_access_key(self, application_id, key_id, **kwargs):
+        # Convert empty application_id and key_id to None to prevent sending invalid data to server
+        if not application_id:
+            application_id = None
+        if not key_id:
+            key_id = None
+        return super().delete_access_key(application_id, key_id, **kwargs)
+
+    def remove_role_from_application_user(self, application_id, role, **kwargs):
+        # Convert empty application_id and role to None to prevent sending invalid data to server
+        if not application_id:
+            application_id = None
+        if not role:
+            role = None
+        return super().remove_role_from_application_user(application_id, role, **kwargs)
+
+    def get_app_by_access_key_id(self, access_key_id: str, **kwargs):
+        # Convert empty access_key_id to None to prevent sending invalid data to server
+        if not access_key_id:
+            access_key_id = None
+        return super().get_app_by_access_key_id(access_key_id, **kwargs)
+
+    def get_access_keys(self, id: str, **kwargs):
+        # Convert empty application id to None to prevent sending invalid data to server
+        if not id:
+            id = None
+        return super().get_access_keys(id=id, **kwargs)
+
+    def toggle_access_key_status(self, application_id, key_id, **kwargs):
+        # Convert empty application_id and key_id to None to prevent sending invalid data to server
+        if not application_id:
+            application_id = None
+        if not key_id:
+            key_id = None
+        return super().toggle_access_key_status(application_id, key_id, **kwargs)
+
+    def get_tags_for_application(self, application_id, **kwargs):
+        # Convert empty application_id to None to prevent sending invalid data to server
+        if not application_id:
+            application_id = None
+        return super().get_tags_for_application(application_id, **kwargs)
+
+    def delete_tag_for_application(self, body, id, **kwargs):
+        # Convert empty tag list (body) and application id to None to prevent sending invalid data to server
+        if not body:
+            body = None
+        if not id:
+            id = None
+        return super().delete_tag_for_application(body, id, **kwargs)

src/conductor/client/adapters/api/user_resource_api_adapter.py

@@ -1,4 +1,27 @@
 from conductor.client.codegen.api.user_resource_api import UserResourceApi
 
 
-class UserResourceApiAdapter(UserResourceApi): ...
+class UserResourceApiAdapter(UserResourceApi):
+    def get_granted_permissions(self, user_id, **kwargs):
+        # Convert empty user_id to None to prevent sending invalid data to server
+        if not user_id:
+            user_id = None
+        return super().get_granted_permissions(user_id=user_id, **kwargs)
+
+    def get_user(self, id, **kwargs):
+        # Convert empty user id to None to prevent sending invalid data to server
+        if not id:
+            id = None
+        return super().get_user(id=id, **kwargs)
+
+    def upsert_user(self, upsert_user_request, id, **kwargs):
+        # Convert empty user id to None to prevent sending invalid data to server
+        if not id:
+            id = None
+        return super().upsert_user(id=id, body=upsert_user_request, **kwargs)
+
+    def delete_user(self, id, **kwargs):
+        # Convert empty user id to None to prevent sending invalid data to server
+        if not id:
+            id = None
+        return super().delete_user(id=id, **kwargs)