label-studio-sdk 2.0.1__py3-none-any.whl → 2.0.2__py3-none-any.whl

label_studio_sdk/model_providers/client.py

@@ -9,8 +9,8 @@ from json.decoder import JSONDecodeError
 from ..core.api_error import ApiError
 from ..types.provider_enum import ProviderEnum
 from ..types.scope_enum import ScopeEnum
-from ..core.jsonable_encoder import jsonable_encoder
 from .types.model_providers_list_model_provider_choices_response import ModelProvidersListModelProviderChoicesResponse
+from ..core.jsonable_encoder import jsonable_encoder
 from ..core.client_wrapper import AsyncClientWrapper
 
 # this is used as the default value for optional parameters
@@ -74,18 +74,18 @@ class ModelProvidersClient:
     def create(
         self,
         *,
-        provider: typing.Optional[ProviderEnum] = OMIT,
         api_key: typing.Optional[str] = OMIT,
         auth_token: typing.Optional[str] = OMIT,
+        budget_alert_threshold: typing.Optional[float] = OMIT,
+        cached_available_models: typing.Optional[str] = OMIT,
         deployment_name: typing.Optional[str] = OMIT,
         endpoint: typing.Optional[str] = OMIT,
         google_application_credentials: typing.Optional[str] = OMIT,
-        google_project_id: typing.Optional[str] = OMIT,
         google_location: typing.Optional[str] = OMIT,
-        cached_available_models: typing.Optional[str] = OMIT,
-        scope: typing.Optional[ScopeEnum] = OMIT,
+        google_project_id: typing.Optional[str] = OMIT,
         is_internal: typing.Optional[bool] = OMIT,
-        budget_alert_threshold: typing.Optional[float] = OMIT,
+        provider: typing.Optional[ProviderEnum] = OMIT,
+        scope: typing.Optional[ScopeEnum] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> ModelProviderConnection:
         """
@@ -93,14 +93,18 @@ class ModelProvidersClient:
 
         Parameters
         ----------
-        provider : typing.Optional[ProviderEnum]
-
         api_key : typing.Optional[str]
             Model provider API key
 
         auth_token : typing.Optional[str]
             Model provider Auth token
 
+        budget_alert_threshold : typing.Optional[float]
+            Budget alert threshold for the given provider connection
+
+        cached_available_models : typing.Optional[str]
+            List of available models from the provider
+
         deployment_name : typing.Optional[str]
             Azure OpenAI deployment name
 
@@ -110,22 +114,18 @@ class ModelProvidersClient:
         google_application_credentials : typing.Optional[str]
             The content of GOOGLE_APPLICATION_CREDENTIALS json file
 
-        google_project_id : typing.Optional[str]
-            Google project ID
-
         google_location : typing.Optional[str]
             Google project location
 
-        cached_available_models : typing.Optional[str]
-            List of available models from the provider
-
-        scope : typing.Optional[ScopeEnum]
+        google_project_id : typing.Optional[str]
+            Google project ID
 
         is_internal : typing.Optional[bool]
             Whether the model provider connection is internal, not visible to the user
 
-        budget_alert_threshold : typing.Optional[float]
-            Budget alert threshold for the given provider connection
+        provider : typing.Optional[ProviderEnum]
+
+        scope : typing.Optional[ScopeEnum]
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
@@ -148,18 +148,18 @@ class ModelProvidersClient:
             "api/model-provider-connections/",
             method="POST",
             json={
-                "provider": provider,
                 "api_key": api_key,
                 "auth_token": auth_token,
+                "budget_alert_threshold": budget_alert_threshold,
+                "cached_available_models": cached_available_models,
                 "deployment_name": deployment_name,
                 "endpoint": endpoint,
                 "google_application_credentials": google_application_credentials,
-                "google_project_id": google_project_id,
                 "google_location": google_location,
-                "cached_available_models": cached_available_models,
-                "scope": scope,
+                "google_project_id": google_project_id,
                 "is_internal": is_internal,
-                "budget_alert_threshold": budget_alert_threshold,
+                "provider": provider,
+                "scope": scope,
             },
             request_options=request_options,
             omit=OMIT,
@@ -178,6 +178,50 @@ class ModelProvidersClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
+    def list_model_provider_choices(
+        self, *, request_options: typing.Optional[RequestOptions] = None
+    ) -> ModelProvidersListModelProviderChoicesResponse:
+        """
+        List all possible model provider choices
+
+        Parameters
+        ----------
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        ModelProvidersListModelProviderChoicesResponse
+            List of model provider choices
+
+        Examples
+        --------
+        from label_studio_sdk import LabelStudio
+
+        client = LabelStudio(
+            api_key="YOUR_API_KEY",
+        )
+        client.model_providers.list_model_provider_choices()
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "api/model-provider-connections/provider-choices",
+            method="GET",
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                return typing.cast(
+                    ModelProvidersListModelProviderChoicesResponse,
+                    construct_type(
+                        type_=ModelProvidersListModelProviderChoicesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, body=_response.text)
+        raise ApiError(status_code=_response.status_code, body=_response_json)
+
     def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> ModelProviderConnection:
         """
         Retrieve a specific model provider connection.
@@ -267,18 +311,18 @@ class ModelProvidersClient:
         self,
         id: str,
         *,
-        provider: typing.Optional[ProviderEnum] = OMIT,
         api_key: typing.Optional[str] = OMIT,
         auth_token: typing.Optional[str] = OMIT,
+        budget_alert_threshold: typing.Optional[float] = OMIT,
+        cached_available_models: typing.Optional[str] = OMIT,
         deployment_name: typing.Optional[str] = OMIT,
         endpoint: typing.Optional[str] = OMIT,
         google_application_credentials: typing.Optional[str] = OMIT,
-        google_project_id: typing.Optional[str] = OMIT,
         google_location: typing.Optional[str] = OMIT,
-        cached_available_models: typing.Optional[str] = OMIT,
-        scope: typing.Optional[ScopeEnum] = OMIT,
+        google_project_id: typing.Optional[str] = OMIT,
         is_internal: typing.Optional[bool] = OMIT,
-        budget_alert_threshold: typing.Optional[float] = OMIT,
+        provider: typing.Optional[ProviderEnum] = OMIT,
+        scope: typing.Optional[ScopeEnum] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> ModelProviderConnection:
         """
@@ -288,14 +332,18 @@ class ModelProvidersClient:
         ----------
         id : str
 
-        provider : typing.Optional[ProviderEnum]
-
         api_key : typing.Optional[str]
             Model provider API key
 
         auth_token : typing.Optional[str]
             Model provider Auth token
 
+        budget_alert_threshold : typing.Optional[float]
+            Budget alert threshold for the given provider connection
+
+        cached_available_models : typing.Optional[str]
+            List of available models from the provider
+
         deployment_name : typing.Optional[str]
             Azure OpenAI deployment name
 
@@ -305,22 +353,18 @@ class ModelProvidersClient:
         google_application_credentials : typing.Optional[str]
             The content of GOOGLE_APPLICATION_CREDENTIALS json file
 
-        google_project_id : typing.Optional[str]
-            Google project ID
-
         google_location : typing.Optional[str]
             Google project location
 
-        cached_available_models : typing.Optional[str]
-            List of available models from the provider
-
-        scope : typing.Optional[ScopeEnum]
+        google_project_id : typing.Optional[str]
+            Google project ID
 
         is_internal : typing.Optional[bool]
             Whether the model provider connection is internal, not visible to the user
 
-        budget_alert_threshold : typing.Optional[float]
-            Budget alert threshold for the given provider connection
+        provider : typing.Optional[ProviderEnum]
+
+        scope : typing.Optional[ScopeEnum]
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
@@ -345,18 +389,18 @@ class ModelProvidersClient:
             f"api/model-provider-connections/{jsonable_encoder(id)}/",
             method="PATCH",
             json={
-                "provider": provider,
                 "api_key": api_key,
                 "auth_token": auth_token,
+                "budget_alert_threshold": budget_alert_threshold,
+                "cached_available_models": cached_available_models,
                 "deployment_name": deployment_name,
                 "endpoint": endpoint,
                 "google_application_credentials": google_application_credentials,
-                "google_project_id": google_project_id,
                 "google_location": google_location,
-                "cached_available_models": cached_available_models,
-                "scope": scope,
+                "google_project_id": google_project_id,
                 "is_internal": is_internal,
-                "budget_alert_threshold": budget_alert_threshold,
+                "provider": provider,
+                "scope": scope,
             },
             headers={
                 "content-type": "application/json",
@@ -378,50 +422,6 @@ class ModelProvidersClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def list_model_provider_choices(
-        self, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> ModelProvidersListModelProviderChoicesResponse:
-        """
-        List all possible model provider choices
-
-        Parameters
-        ----------
-        request_options : typing.Optional[RequestOptions]
-            Request-specific configuration.
-
-        Returns
-        -------
-        ModelProvidersListModelProviderChoicesResponse
-            List of model provider choices
-
-        Examples
-        --------
-        from label_studio_sdk import LabelStudio
-
-        client = LabelStudio(
-            api_key="YOUR_API_KEY",
-        )
-        client.model_providers.list_model_provider_choices()
-        """
-        _response = self._client_wrapper.httpx_client.request(
-            "api/model-provider-connections/provider-choices",
-            method="GET",
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    ModelProvidersListModelProviderChoicesResponse,
-                    construct_type(
-                        type_=ModelProvidersListModelProviderChoicesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
-
 
 class AsyncModelProvidersClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
@@ -488,18 +488,18 @@ class AsyncModelProvidersClient:
     async def create(
         self,
         *,
-        provider: typing.Optional[ProviderEnum] = OMIT,
         api_key: typing.Optional[str] = OMIT,
         auth_token: typing.Optional[str] = OMIT,
+        budget_alert_threshold: typing.Optional[float] = OMIT,
+        cached_available_models: typing.Optional[str] = OMIT,
         deployment_name: typing.Optional[str] = OMIT,
         endpoint: typing.Optional[str] = OMIT,
         google_application_credentials: typing.Optional[str] = OMIT,
-        google_project_id: typing.Optional[str] = OMIT,
         google_location: typing.Optional[str] = OMIT,
-        cached_available_models: typing.Optional[str] = OMIT,
-        scope: typing.Optional[ScopeEnum] = OMIT,
+        google_project_id: typing.Optional[str] = OMIT,
         is_internal: typing.Optional[bool] = OMIT,
-        budget_alert_threshold: typing.Optional[float] = OMIT,
+        provider: typing.Optional[ProviderEnum] = OMIT,
+        scope: typing.Optional[ScopeEnum] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> ModelProviderConnection:
         """
@@ -507,14 +507,18 @@ class AsyncModelProvidersClient:
 
         Parameters
         ----------
-        provider : typing.Optional[ProviderEnum]
-
         api_key : typing.Optional[str]
             Model provider API key
 
         auth_token : typing.Optional[str]
             Model provider Auth token
 
+        budget_alert_threshold : typing.Optional[float]
+            Budget alert threshold for the given provider connection
+
+        cached_available_models : typing.Optional[str]
+            List of available models from the provider
+
         deployment_name : typing.Optional[str]
             Azure OpenAI deployment name
 
@@ -524,22 +528,18 @@ class AsyncModelProvidersClient:
         google_application_credentials : typing.Optional[str]
             The content of GOOGLE_APPLICATION_CREDENTIALS json file
 
-        google_project_id : typing.Optional[str]
-            Google project ID
-
         google_location : typing.Optional[str]
             Google project location
 
-        cached_available_models : typing.Optional[str]
-            List of available models from the provider
-
-        scope : typing.Optional[ScopeEnum]
+        google_project_id : typing.Optional[str]
+            Google project ID
 
         is_internal : typing.Optional[bool]
             Whether the model provider connection is internal, not visible to the user
 
-        budget_alert_threshold : typing.Optional[float]
-            Budget alert threshold for the given provider connection
+        provider : typing.Optional[ProviderEnum]
+
+        scope : typing.Optional[ScopeEnum]
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
@@ -570,18 +570,18 @@ class AsyncModelProvidersClient:
             "api/model-provider-connections/",
             method="POST",
             json={
-                "provider": provider,
                 "api_key": api_key,
                 "auth_token": auth_token,
+                "budget_alert_threshold": budget_alert_threshold,
+                "cached_available_models": cached_available_models,
                 "deployment_name": deployment_name,
                 "endpoint": endpoint,
                 "google_application_credentials": google_application_credentials,
-                "google_project_id": google_project_id,
                 "google_location": google_location,
-                "cached_available_models": cached_available_models,
-                "scope": scope,
+                "google_project_id": google_project_id,
                 "is_internal": is_internal,
-                "budget_alert_threshold": budget_alert_threshold,
+                "provider": provider,
+                "scope": scope,
             },
             request_options=request_options,
             omit=OMIT,
@@ -600,6 +600,58 @@ class AsyncModelProvidersClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
+    async def list_model_provider_choices(
+        self, *, request_options: typing.Optional[RequestOptions] = None
+    ) -> ModelProvidersListModelProviderChoicesResponse:
+        """
+        List all possible model provider choices
+
+        Parameters
+        ----------
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        ModelProvidersListModelProviderChoicesResponse
+            List of model provider choices
+
+        Examples
+        --------
+        import asyncio
+
+        from label_studio_sdk import AsyncLabelStudio
+
+        client = AsyncLabelStudio(
+            api_key="YOUR_API_KEY",
+        )
+
+
+        async def main() -> None:
+            await client.model_providers.list_model_provider_choices()
+
+
+        asyncio.run(main())
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "api/model-provider-connections/provider-choices",
+            method="GET",
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                return typing.cast(
+                    ModelProvidersListModelProviderChoicesResponse,
+                    construct_type(
+                        type_=ModelProvidersListModelProviderChoicesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, body=_response.text)
+        raise ApiError(status_code=_response.status_code, body=_response_json)
+
     async def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> ModelProviderConnection:
         """
         Retrieve a specific model provider connection.
@@ -705,18 +757,18 @@ class AsyncModelProvidersClient:
         self,
         id: str,
         *,
-        provider: typing.Optional[ProviderEnum] = OMIT,
         api_key: typing.Optional[str] = OMIT,
         auth_token: typing.Optional[str] = OMIT,
+        budget_alert_threshold: typing.Optional[float] = OMIT,
+        cached_available_models: typing.Optional[str] = OMIT,
         deployment_name: typing.Optional[str] = OMIT,
         endpoint: typing.Optional[str] = OMIT,
         google_application_credentials: typing.Optional[str] = OMIT,
-        google_project_id: typing.Optional[str] = OMIT,
         google_location: typing.Optional[str] = OMIT,
-        cached_available_models: typing.Optional[str] = OMIT,
-        scope: typing.Optional[ScopeEnum] = OMIT,
+        google_project_id: typing.Optional[str] = OMIT,
         is_internal: typing.Optional[bool] = OMIT,
-        budget_alert_threshold: typing.Optional[float] = OMIT,
+        provider: typing.Optional[ProviderEnum] = OMIT,
+        scope: typing.Optional[ScopeEnum] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> ModelProviderConnection:
         """
@@ -726,14 +778,18 @@ class AsyncModelProvidersClient:
         ----------
         id : str
 
-        provider : typing.Optional[ProviderEnum]
-
         api_key : typing.Optional[str]
             Model provider API key
 
         auth_token : typing.Optional[str]
             Model provider Auth token
 
+        budget_alert_threshold : typing.Optional[float]
+            Budget alert threshold for the given provider connection
+
+        cached_available_models : typing.Optional[str]
+            List of available models from the provider
+
         deployment_name : typing.Optional[str]
             Azure OpenAI deployment name
 
@@ -743,22 +799,18 @@ class AsyncModelProvidersClient:
         google_application_credentials : typing.Optional[str]
             The content of GOOGLE_APPLICATION_CREDENTIALS json file
 
-        google_project_id : typing.Optional[str]
-            Google project ID
-
         google_location : typing.Optional[str]
             Google project location
 
-        cached_available_models : typing.Optional[str]
-            List of available models from the provider
-
-        scope : typing.Optional[ScopeEnum]
+        google_project_id : typing.Optional[str]
+            Google project ID
 
         is_internal : typing.Optional[bool]
             Whether the model provider connection is internal, not visible to the user
 
-        budget_alert_threshold : typing.Optional[float]
-            Budget alert threshold for the given provider connection
+        provider : typing.Optional[ProviderEnum]
+
+        scope : typing.Optional[ScopeEnum]
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
@@ -791,18 +843,18 @@ class AsyncModelProvidersClient:
             f"api/model-provider-connections/{jsonable_encoder(id)}/",
             method="PATCH",
             json={
-                "provider": provider,
                 "api_key": api_key,
                 "auth_token": auth_token,
+                "budget_alert_threshold": budget_alert_threshold,
+                "cached_available_models": cached_available_models,
                 "deployment_name": deployment_name,
                 "endpoint": endpoint,
                 "google_application_credentials": google_application_credentials,
-                "google_project_id": google_project_id,
                 "google_location": google_location,
-                "cached_available_models": cached_available_models,
-                "scope": scope,
+                "google_project_id": google_project_id,
                 "is_internal": is_internal,
-                "budget_alert_threshold": budget_alert_threshold,
+                "provider": provider,
+                "scope": scope,
             },
             headers={
                 "content-type": "application/json",
@@ -823,55 +875,3 @@ class AsyncModelProvidersClient:
         except JSONDecodeError:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
-
-    async def list_model_provider_choices(
-        self, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> ModelProvidersListModelProviderChoicesResponse:
-        """
-        List all possible model provider choices
-
-        Parameters
-        ----------
-        request_options : typing.Optional[RequestOptions]
-            Request-specific configuration.
-
-        Returns
-        -------
-        ModelProvidersListModelProviderChoicesResponse
-            List of model provider choices
-
-        Examples
-        --------
-        import asyncio
-
-        from label_studio_sdk import AsyncLabelStudio
-
-        client = AsyncLabelStudio(
-            api_key="YOUR_API_KEY",
-        )
-
-
-        async def main() -> None:
-            await client.model_providers.list_model_provider_choices()
-
-
-        asyncio.run(main())
-        """
-        _response = await self._client_wrapper.httpx_client.request(
-            "api/model-provider-connections/provider-choices",
-            method="GET",
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    ModelProvidersListModelProviderChoicesResponse,
-                    construct_type(
-                        type_=ModelProvidersListModelProviderChoicesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)

label_studio_sdk/organizations/members/client.py

@@ -112,8 +112,8 @@ class MembersClient:
         self,
         id: int,
         *,
-        user_id: typing.Optional[int] = OMIT,
         role: typing.Optional[Role9E7Enum] = OMIT,
+        user_id: typing.Optional[int] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> LseOrganizationMemberList:
         """
@@ -136,10 +136,10 @@ class MembersClient:
         id : int
             A unique integer value identifying this organization.
 
-        user_id : typing.Optional[int]
-
         role : typing.Optional[Role9E7Enum]
 
+        user_id : typing.Optional[int]
+
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
@@ -163,8 +163,8 @@ class MembersClient:
             f"api/organizations/{jsonable_encoder(id)}/memberships",
             method="PATCH",
             json={
-                "user_id": user_id,
                 "role": role,
+                "user_id": user_id,
             },
             headers={
                 "content-type": "application/json",
@@ -412,8 +412,8 @@ class AsyncMembersClient:
         self,
         id: int,
         *,
-        user_id: typing.Optional[int] = OMIT,
         role: typing.Optional[Role9E7Enum] = OMIT,
+        user_id: typing.Optional[int] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> LseOrganizationMemberList:
         """
@@ -436,10 +436,10 @@ class AsyncMembersClient:
         id : int
             A unique integer value identifying this organization.
 
-        user_id : typing.Optional[int]
-
         role : typing.Optional[Role9E7Enum]
 
+        user_id : typing.Optional[int]
+
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
@@ -471,8 +471,8 @@ class AsyncMembersClient:
             f"api/organizations/{jsonable_encoder(id)}/memberships",
             method="PATCH",
             json={
-                "user_id": user_id,
                 "role": role,
+                "user_id": user_id,
             },
             headers={
                 "content-type": "application/json",