From a5265bc79c7bfb835dc2b971f8a92ef372db3fb3 Mon Sep 17 00:00:00 2001 From: Alex Arvanitidis Date: Wed, 4 Dec 2024 12:43:12 +0200 Subject: [PATCH] fix: packageName --- etc/openapi-generate.sh | 6 +- src/jaqpot_api_client/__init__.py | 150 +++++++++--------- src/jaqpot_api_client/api/__init__.py | 22 +-- src/jaqpot_api_client/api/api_keys_api.py | 18 +-- src/jaqpot_api_client/api/auth_api.py | 6 +- src/jaqpot_api_client/api/dataset_api.py | 10 +- src/jaqpot_api_client/api/feature_api.py | 10 +- src/jaqpot_api_client/api/lead_api.py | 8 +- src/jaqpot_api_client/api/model_api.py | 22 +-- src/jaqpot_api_client/api/organization_api.py | 10 +- .../api/organization_invitation_api.py | 10 +- src/jaqpot_api_client/api/user_api.py | 8 +- .../api/user_settings0_api.py | 8 +- .../api/user_settings_api.py | 8 +- src/jaqpot_api_client/api_client.py | 12 +- src/jaqpot_api_client/configuration.py | 2 +- src/jaqpot_api_client/models/__init__.py | 110 ++++++------- .../models/city_block_doa.py | 13 +- src/jaqpot_api_client/models/dataset.py | 2 +- src/jaqpot_api_client/models/dataset_csv.py | 2 +- src/jaqpot_api_client/models/doa.py | 2 +- src/jaqpot_api_client/models/feature.py | 4 +- .../models/get_datasets200_response.py | 2 +- .../models/get_models200_response.py | 2 +- .../models/kernel_based_doa.py | 28 +++- .../models/mahalanobis_doa.py | 14 +- src/jaqpot_api_client/models/model.py | 22 +-- src/jaqpot_api_client/models/model_scores.py | 2 +- src/jaqpot_api_client/models/model_summary.py | 8 +- src/jaqpot_api_client/models/organization.py | 6 +- .../models/organization_user.py | 2 +- .../partial_update_organization_request.py | 2 +- .../partially_update_model_feature_request.py | 4 +- .../models/partially_update_model_request.py | 4 +- .../models/prediction_doa.py | 2 +- .../models/prediction_model.py | 10 +- .../models/prediction_request.py | 4 +- src/jaqpot_api_client/models/scores.py | 6 +- src/jaqpot_api_client/rest.py | 2 +- 39 files changed, 294 insertions(+), 269 deletions(-) diff --git a/etc/openapi-generate.sh b/etc/openapi-generate.sh index 922d670..9d077f8 100755 --- a/etc/openapi-generate.sh +++ b/etc/openapi-generate.sh @@ -2,7 +2,7 @@ set -e # Exit immediately if a command exits with a non-zero status. -TEMP_DIR=$(mktemp -d) +TEMP_DIR=$(mktemp -d -p .) TARGET_DIR=./src/jaqpot_api_client # Install openapi-generator-cli if not already installed @@ -17,13 +17,13 @@ openapi-generator-cli generate \ -i https://raw.githubusercontent.com/ntua-unit-of-control-and-informatics/jaqpot-api/refs/heads/main/src/main/resources/openapi.yaml \ -g python \ -o $TEMP_DIR \ - --additional-properties packageName=src.jaqpot_api_client + --additional-properties packageName=jaqpot_api_client # Ensure the target directory exists mkdir -p $TARGET_DIR # Move only the necessary files -cp -r $TEMP_DIR/src/jaqpot_api_client/* $TARGET_DIR/ +cp -r $TEMP_DIR/jaqpot_api_client/* $TARGET_DIR/ # Clean up rm -rf $TEMP_DIR diff --git a/src/jaqpot_api_client/__init__.py b/src/jaqpot_api_client/__init__.py index 7c73339..5cd1343 100644 --- a/src/jaqpot_api_client/__init__.py +++ b/src/jaqpot_api_client/__init__.py @@ -18,82 +18,82 @@ __version__ = "1.0.0" # import apis into sdk package -from src.jaqpot_api_client.api.user_settings_api import UserSettingsApi -from src.jaqpot_api_client.api.api_keys_api import ApiKeysApi -from src.jaqpot_api_client.api.auth_api import AuthApi -from src.jaqpot_api_client.api.dataset_api import DatasetApi -from src.jaqpot_api_client.api.feature_api import FeatureApi -from src.jaqpot_api_client.api.lead_api import LeadApi -from src.jaqpot_api_client.api.model_api import ModelApi -from src.jaqpot_api_client.api.organization_api import OrganizationApi -from src.jaqpot_api_client.api.organization_invitation_api import OrganizationInvitationApi -from src.jaqpot_api_client.api.user_api import UserApi -from src.jaqpot_api_client.api.user_settings_api import UserSettingsApi +from jaqpot_api_client.api.user_settings_api import UserSettingsApi +from jaqpot_api_client.api.api_keys_api import ApiKeysApi +from jaqpot_api_client.api.auth_api import AuthApi +from jaqpot_api_client.api.dataset_api import DatasetApi +from jaqpot_api_client.api.feature_api import FeatureApi +from jaqpot_api_client.api.lead_api import LeadApi +from jaqpot_api_client.api.model_api import ModelApi +from jaqpot_api_client.api.organization_api import OrganizationApi +from jaqpot_api_client.api.organization_invitation_api import OrganizationInvitationApi +from jaqpot_api_client.api.user_api import UserApi +from jaqpot_api_client.api.user_settings_api import UserSettingsApi # import ApiClient -from src.jaqpot_api_client.api_response import ApiResponse -from src.jaqpot_api_client.api_client import ApiClient -from src.jaqpot_api_client.configuration import Configuration -from src.jaqpot_api_client.exceptions import OpenApiException -from src.jaqpot_api_client.exceptions import ApiTypeError -from src.jaqpot_api_client.exceptions import ApiValueError -from src.jaqpot_api_client.exceptions import ApiKeyError -from src.jaqpot_api_client.exceptions import ApiAttributeError -from src.jaqpot_api_client.exceptions import ApiException +from jaqpot_api_client.api_response import ApiResponse +from jaqpot_api_client.api_client import ApiClient +from jaqpot_api_client.configuration import Configuration +from jaqpot_api_client.exceptions import OpenApiException +from jaqpot_api_client.exceptions import ApiTypeError +from jaqpot_api_client.exceptions import ApiValueError +from jaqpot_api_client.exceptions import ApiKeyError +from jaqpot_api_client.exceptions import ApiAttributeError +from jaqpot_api_client.exceptions import ApiException # import models into sdk package -from src.jaqpot_api_client.models.api_key import ApiKey -from src.jaqpot_api_client.models.archive_model200_response import ArchiveModel200Response -from src.jaqpot_api_client.models.binary_classification_scores import BinaryClassificationScores -from src.jaqpot_api_client.models.bounding_box_doa import BoundingBoxDoa -from src.jaqpot_api_client.models.city_block_doa import CityBlockDoa -from src.jaqpot_api_client.models.create_api_key201_response import CreateApiKey201Response -from src.jaqpot_api_client.models.create_invitations_request import CreateInvitationsRequest -from src.jaqpot_api_client.models.dataset import Dataset -from src.jaqpot_api_client.models.dataset_csv import DatasetCSV -from src.jaqpot_api_client.models.dataset_type import DatasetType -from src.jaqpot_api_client.models.doa import Doa -from src.jaqpot_api_client.models.doa_method import DoaMethod -from src.jaqpot_api_client.models.error_code import ErrorCode -from src.jaqpot_api_client.models.error_response import ErrorResponse -from src.jaqpot_api_client.models.feature import Feature -from src.jaqpot_api_client.models.feature_possible_value import FeaturePossibleValue -from src.jaqpot_api_client.models.feature_type import FeatureType -from src.jaqpot_api_client.models.get_all_api_keys_for_user200_response_inner import GetAllApiKeysForUser200ResponseInner -from src.jaqpot_api_client.models.get_datasets200_response import GetDatasets200Response -from src.jaqpot_api_client.models.get_models200_response import GetModels200Response -from src.jaqpot_api_client.models.kernel_based_doa import KernelBasedDoa -from src.jaqpot_api_client.models.lead import Lead -from src.jaqpot_api_client.models.leverage_doa import LeverageDoa -from src.jaqpot_api_client.models.library import Library -from src.jaqpot_api_client.models.mahalanobis_doa import MahalanobisDoa -from src.jaqpot_api_client.models.mean_var_doa import MeanVarDoa -from src.jaqpot_api_client.models.model import Model -from src.jaqpot_api_client.models.model_scores import ModelScores -from src.jaqpot_api_client.models.model_summary import ModelSummary -from src.jaqpot_api_client.models.model_task import ModelTask -from src.jaqpot_api_client.models.model_type import ModelType -from src.jaqpot_api_client.models.model_visibility import ModelVisibility -from src.jaqpot_api_client.models.multiclass_classification_scores import MulticlassClassificationScores -from src.jaqpot_api_client.models.organization import Organization -from src.jaqpot_api_client.models.organization_invitation import OrganizationInvitation -from src.jaqpot_api_client.models.organization_summary import OrganizationSummary -from src.jaqpot_api_client.models.organization_user import OrganizationUser -from src.jaqpot_api_client.models.organization_user_association_type import OrganizationUserAssociationType -from src.jaqpot_api_client.models.organization_visibility import OrganizationVisibility -from src.jaqpot_api_client.models.partial_update_organization_request import PartialUpdateOrganizationRequest -from src.jaqpot_api_client.models.partially_update_model_feature_request import PartiallyUpdateModelFeatureRequest -from src.jaqpot_api_client.models.partially_update_model_request import PartiallyUpdateModelRequest -from src.jaqpot_api_client.models.prediction_doa import PredictionDoa -from src.jaqpot_api_client.models.prediction_model import PredictionModel -from src.jaqpot_api_client.models.prediction_request import PredictionRequest -from src.jaqpot_api_client.models.prediction_response import PredictionResponse -from src.jaqpot_api_client.models.r_pbpk_config import RPbpkConfig -from src.jaqpot_api_client.models.regression_scores import RegressionScores -from src.jaqpot_api_client.models.scores import Scores -from src.jaqpot_api_client.models.transformer import Transformer -from src.jaqpot_api_client.models.unarchive_model200_response import UnarchiveModel200Response -from src.jaqpot_api_client.models.update_api_key200_response import UpdateApiKey200Response -from src.jaqpot_api_client.models.update_api_key_request import UpdateApiKeyRequest -from src.jaqpot_api_client.models.user import User -from src.jaqpot_api_client.models.user_settings import UserSettings +from jaqpot_api_client.models.api_key import ApiKey +from jaqpot_api_client.models.archive_model200_response import ArchiveModel200Response +from jaqpot_api_client.models.binary_classification_scores import BinaryClassificationScores +from jaqpot_api_client.models.bounding_box_doa import BoundingBoxDoa +from jaqpot_api_client.models.city_block_doa import CityBlockDoa +from jaqpot_api_client.models.create_api_key201_response import CreateApiKey201Response +from jaqpot_api_client.models.create_invitations_request import CreateInvitationsRequest +from jaqpot_api_client.models.dataset import Dataset +from jaqpot_api_client.models.dataset_csv import DatasetCSV +from jaqpot_api_client.models.dataset_type import DatasetType +from jaqpot_api_client.models.doa import Doa +from jaqpot_api_client.models.doa_method import DoaMethod +from jaqpot_api_client.models.error_code import ErrorCode +from jaqpot_api_client.models.error_response import ErrorResponse +from jaqpot_api_client.models.feature import Feature +from jaqpot_api_client.models.feature_possible_value import FeaturePossibleValue +from jaqpot_api_client.models.feature_type import FeatureType +from jaqpot_api_client.models.get_all_api_keys_for_user200_response_inner import GetAllApiKeysForUser200ResponseInner +from jaqpot_api_client.models.get_datasets200_response import GetDatasets200Response +from jaqpot_api_client.models.get_models200_response import GetModels200Response +from jaqpot_api_client.models.kernel_based_doa import KernelBasedDoa +from jaqpot_api_client.models.lead import Lead +from jaqpot_api_client.models.leverage_doa import LeverageDoa +from jaqpot_api_client.models.library import Library +from jaqpot_api_client.models.mahalanobis_doa import MahalanobisDoa +from jaqpot_api_client.models.mean_var_doa import MeanVarDoa +from jaqpot_api_client.models.model import Model +from jaqpot_api_client.models.model_scores import ModelScores +from jaqpot_api_client.models.model_summary import ModelSummary +from jaqpot_api_client.models.model_task import ModelTask +from jaqpot_api_client.models.model_type import ModelType +from jaqpot_api_client.models.model_visibility import ModelVisibility +from jaqpot_api_client.models.multiclass_classification_scores import MulticlassClassificationScores +from jaqpot_api_client.models.organization import Organization +from jaqpot_api_client.models.organization_invitation import OrganizationInvitation +from jaqpot_api_client.models.organization_summary import OrganizationSummary +from jaqpot_api_client.models.organization_user import OrganizationUser +from jaqpot_api_client.models.organization_user_association_type import OrganizationUserAssociationType +from jaqpot_api_client.models.organization_visibility import OrganizationVisibility +from jaqpot_api_client.models.partial_update_organization_request import PartialUpdateOrganizationRequest +from jaqpot_api_client.models.partially_update_model_feature_request import PartiallyUpdateModelFeatureRequest +from jaqpot_api_client.models.partially_update_model_request import PartiallyUpdateModelRequest +from jaqpot_api_client.models.prediction_doa import PredictionDoa +from jaqpot_api_client.models.prediction_model import PredictionModel +from jaqpot_api_client.models.prediction_request import PredictionRequest +from jaqpot_api_client.models.prediction_response import PredictionResponse +from jaqpot_api_client.models.r_pbpk_config import RPbpkConfig +from jaqpot_api_client.models.regression_scores import RegressionScores +from jaqpot_api_client.models.scores import Scores +from jaqpot_api_client.models.transformer import Transformer +from jaqpot_api_client.models.unarchive_model200_response import UnarchiveModel200Response +from jaqpot_api_client.models.update_api_key200_response import UpdateApiKey200Response +from jaqpot_api_client.models.update_api_key_request import UpdateApiKeyRequest +from jaqpot_api_client.models.user import User +from jaqpot_api_client.models.user_settings import UserSettings diff --git a/src/jaqpot_api_client/api/__init__.py b/src/jaqpot_api_client/api/__init__.py index 7742b4f..f10b556 100644 --- a/src/jaqpot_api_client/api/__init__.py +++ b/src/jaqpot_api_client/api/__init__.py @@ -1,15 +1,15 @@ # flake8: noqa # import apis into api package -from src.jaqpot_api_client.api.user_settings_api import UserSettingsApi -from src.jaqpot_api_client.api.api_keys_api import ApiKeysApi -from src.jaqpot_api_client.api.auth_api import AuthApi -from src.jaqpot_api_client.api.dataset_api import DatasetApi -from src.jaqpot_api_client.api.feature_api import FeatureApi -from src.jaqpot_api_client.api.lead_api import LeadApi -from src.jaqpot_api_client.api.model_api import ModelApi -from src.jaqpot_api_client.api.organization_api import OrganizationApi -from src.jaqpot_api_client.api.organization_invitation_api import OrganizationInvitationApi -from src.jaqpot_api_client.api.user_api import UserApi -from src.jaqpot_api_client.api.user_settings_api import UserSettingsApi +from jaqpot_api_client.api.user_settings_api import UserSettingsApi +from jaqpot_api_client.api.api_keys_api import ApiKeysApi +from jaqpot_api_client.api.auth_api import AuthApi +from jaqpot_api_client.api.dataset_api import DatasetApi +from jaqpot_api_client.api.feature_api import FeatureApi +from jaqpot_api_client.api.lead_api import LeadApi +from jaqpot_api_client.api.model_api import ModelApi +from jaqpot_api_client.api.organization_api import OrganizationApi +from jaqpot_api_client.api.organization_invitation_api import OrganizationInvitationApi +from jaqpot_api_client.api.user_api import UserApi +from jaqpot_api_client.api.user_settings_api import UserSettingsApi diff --git a/src/jaqpot_api_client/api/api_keys_api.py b/src/jaqpot_api_client/api/api_keys_api.py index e28ee4f..ab681fa 100644 --- a/src/jaqpot_api_client/api/api_keys_api.py +++ b/src/jaqpot_api_client/api/api_keys_api.py @@ -20,15 +20,15 @@ from pydantic import Field, StrictStr from typing import List from typing_extensions import Annotated -from src.jaqpot_api_client.models.api_key import ApiKey -from src.jaqpot_api_client.models.create_api_key201_response import CreateApiKey201Response -from src.jaqpot_api_client.models.get_all_api_keys_for_user200_response_inner import GetAllApiKeysForUser200ResponseInner -from src.jaqpot_api_client.models.update_api_key200_response import UpdateApiKey200Response -from src.jaqpot_api_client.models.update_api_key_request import UpdateApiKeyRequest - -from src.jaqpot_api_client.api_client import ApiClient, RequestSerialized -from src.jaqpot_api_client.api_response import ApiResponse -from src.jaqpot_api_client.rest import RESTResponseType +from jaqpot_api_client.models.api_key import ApiKey +from jaqpot_api_client.models.create_api_key201_response import CreateApiKey201Response +from jaqpot_api_client.models.get_all_api_keys_for_user200_response_inner import GetAllApiKeysForUser200ResponseInner +from jaqpot_api_client.models.update_api_key200_response import UpdateApiKey200Response +from jaqpot_api_client.models.update_api_key_request import UpdateApiKeyRequest + +from jaqpot_api_client.api_client import ApiClient, RequestSerialized +from jaqpot_api_client.api_response import ApiResponse +from jaqpot_api_client.rest import RESTResponseType class ApiKeysApi: diff --git a/src/jaqpot_api_client/api/auth_api.py b/src/jaqpot_api_client/api/auth_api.py index adfa2e2..567f04d 100644 --- a/src/jaqpot_api_client/api/auth_api.py +++ b/src/jaqpot_api_client/api/auth_api.py @@ -18,9 +18,9 @@ from typing_extensions import Annotated -from src.jaqpot_api_client.api_client import ApiClient, RequestSerialized -from src.jaqpot_api_client.api_response import ApiResponse -from src.jaqpot_api_client.rest import RESTResponseType +from jaqpot_api_client.api_client import ApiClient, RequestSerialized +from jaqpot_api_client.api_response import ApiResponse +from jaqpot_api_client.rest import RESTResponseType class AuthApi: diff --git a/src/jaqpot_api_client/api/dataset_api.py b/src/jaqpot_api_client/api/dataset_api.py index 1ec36dd..fe82e26 100644 --- a/src/jaqpot_api_client/api/dataset_api.py +++ b/src/jaqpot_api_client/api/dataset_api.py @@ -20,12 +20,12 @@ from pydantic import Field, StrictInt, StrictStr from typing import List, Optional from typing_extensions import Annotated -from src.jaqpot_api_client.models.dataset import Dataset -from src.jaqpot_api_client.models.get_datasets200_response import GetDatasets200Response +from jaqpot_api_client.models.dataset import Dataset +from jaqpot_api_client.models.get_datasets200_response import GetDatasets200Response -from src.jaqpot_api_client.api_client import ApiClient, RequestSerialized -from src.jaqpot_api_client.api_response import ApiResponse -from src.jaqpot_api_client.rest import RESTResponseType +from jaqpot_api_client.api_client import ApiClient, RequestSerialized +from jaqpot_api_client.api_response import ApiResponse +from jaqpot_api_client.rest import RESTResponseType class DatasetApi: diff --git a/src/jaqpot_api_client/api/feature_api.py b/src/jaqpot_api_client/api/feature_api.py index aef95b9..3cf4c7e 100644 --- a/src/jaqpot_api_client/api/feature_api.py +++ b/src/jaqpot_api_client/api/feature_api.py @@ -19,12 +19,12 @@ from pydantic import Field, StrictInt from typing_extensions import Annotated -from src.jaqpot_api_client.models.feature import Feature -from src.jaqpot_api_client.models.partially_update_model_feature_request import PartiallyUpdateModelFeatureRequest +from jaqpot_api_client.models.feature import Feature +from jaqpot_api_client.models.partially_update_model_feature_request import PartiallyUpdateModelFeatureRequest -from src.jaqpot_api_client.api_client import ApiClient, RequestSerialized -from src.jaqpot_api_client.api_response import ApiResponse -from src.jaqpot_api_client.rest import RESTResponseType +from jaqpot_api_client.api_client import ApiClient, RequestSerialized +from jaqpot_api_client.api_response import ApiResponse +from jaqpot_api_client.rest import RESTResponseType class FeatureApi: diff --git a/src/jaqpot_api_client/api/lead_api.py b/src/jaqpot_api_client/api/lead_api.py index 9e2dcd7..1c3ab27 100644 --- a/src/jaqpot_api_client/api/lead_api.py +++ b/src/jaqpot_api_client/api/lead_api.py @@ -20,11 +20,11 @@ from pydantic import Field, StrictInt from typing import List from typing_extensions import Annotated -from src.jaqpot_api_client.models.lead import Lead +from jaqpot_api_client.models.lead import Lead -from src.jaqpot_api_client.api_client import ApiClient, RequestSerialized -from src.jaqpot_api_client.api_response import ApiResponse -from src.jaqpot_api_client.rest import RESTResponseType +from jaqpot_api_client.api_client import ApiClient, RequestSerialized +from jaqpot_api_client.api_response import ApiResponse +from jaqpot_api_client.rest import RESTResponseType class LeadApi: diff --git a/src/jaqpot_api_client/api/model_api.py b/src/jaqpot_api_client/api/model_api.py index c6ca6cc..34ddf16 100644 --- a/src/jaqpot_api_client/api/model_api.py +++ b/src/jaqpot_api_client/api/model_api.py @@ -20,17 +20,17 @@ from pydantic import Field, StrictInt, StrictStr from typing import List, Optional from typing_extensions import Annotated -from src.jaqpot_api_client.models.archive_model200_response import ArchiveModel200Response -from src.jaqpot_api_client.models.dataset import Dataset -from src.jaqpot_api_client.models.dataset_csv import DatasetCSV -from src.jaqpot_api_client.models.get_models200_response import GetModels200Response -from src.jaqpot_api_client.models.model import Model -from src.jaqpot_api_client.models.partially_update_model_request import PartiallyUpdateModelRequest -from src.jaqpot_api_client.models.unarchive_model200_response import UnarchiveModel200Response - -from src.jaqpot_api_client.api_client import ApiClient, RequestSerialized -from src.jaqpot_api_client.api_response import ApiResponse -from src.jaqpot_api_client.rest import RESTResponseType +from jaqpot_api_client.models.archive_model200_response import ArchiveModel200Response +from jaqpot_api_client.models.dataset import Dataset +from jaqpot_api_client.models.dataset_csv import DatasetCSV +from jaqpot_api_client.models.get_models200_response import GetModels200Response +from jaqpot_api_client.models.model import Model +from jaqpot_api_client.models.partially_update_model_request import PartiallyUpdateModelRequest +from jaqpot_api_client.models.unarchive_model200_response import UnarchiveModel200Response + +from jaqpot_api_client.api_client import ApiClient, RequestSerialized +from jaqpot_api_client.api_response import ApiResponse +from jaqpot_api_client.rest import RESTResponseType class ModelApi: diff --git a/src/jaqpot_api_client/api/organization_api.py b/src/jaqpot_api_client/api/organization_api.py index 47eebea..0382ee1 100644 --- a/src/jaqpot_api_client/api/organization_api.py +++ b/src/jaqpot_api_client/api/organization_api.py @@ -19,12 +19,12 @@ from pydantic import StrictInt, StrictStr from typing import List -from src.jaqpot_api_client.models.organization import Organization -from src.jaqpot_api_client.models.partial_update_organization_request import PartialUpdateOrganizationRequest +from jaqpot_api_client.models.organization import Organization +from jaqpot_api_client.models.partial_update_organization_request import PartialUpdateOrganizationRequest -from src.jaqpot_api_client.api_client import ApiClient, RequestSerialized -from src.jaqpot_api_client.api_response import ApiResponse -from src.jaqpot_api_client.rest import RESTResponseType +from jaqpot_api_client.api_client import ApiClient, RequestSerialized +from jaqpot_api_client.api_response import ApiResponse +from jaqpot_api_client.rest import RESTResponseType class OrganizationApi: diff --git a/src/jaqpot_api_client/api/organization_invitation_api.py b/src/jaqpot_api_client/api/organization_invitation_api.py index 45cb218..2a6abec 100644 --- a/src/jaqpot_api_client/api/organization_invitation_api.py +++ b/src/jaqpot_api_client/api/organization_invitation_api.py @@ -20,12 +20,12 @@ from pydantic import Field, StrictInt, StrictStr from typing import List from typing_extensions import Annotated -from src.jaqpot_api_client.models.create_invitations_request import CreateInvitationsRequest -from src.jaqpot_api_client.models.organization_invitation import OrganizationInvitation +from jaqpot_api_client.models.create_invitations_request import CreateInvitationsRequest +from jaqpot_api_client.models.organization_invitation import OrganizationInvitation -from src.jaqpot_api_client.api_client import ApiClient, RequestSerialized -from src.jaqpot_api_client.api_response import ApiResponse -from src.jaqpot_api_client.rest import RESTResponseType +from jaqpot_api_client.api_client import ApiClient, RequestSerialized +from jaqpot_api_client.api_response import ApiResponse +from jaqpot_api_client.rest import RESTResponseType class OrganizationInvitationApi: diff --git a/src/jaqpot_api_client/api/user_api.py b/src/jaqpot_api_client/api/user_api.py index a888d96..8e61b1f 100644 --- a/src/jaqpot_api_client/api/user_api.py +++ b/src/jaqpot_api_client/api/user_api.py @@ -19,11 +19,11 @@ from pydantic import Field, StrictStr from typing_extensions import Annotated -from src.jaqpot_api_client.models.user import User +from jaqpot_api_client.models.user import User -from src.jaqpot_api_client.api_client import ApiClient, RequestSerialized -from src.jaqpot_api_client.api_response import ApiResponse -from src.jaqpot_api_client.rest import RESTResponseType +from jaqpot_api_client.api_client import ApiClient, RequestSerialized +from jaqpot_api_client.api_response import ApiResponse +from jaqpot_api_client.rest import RESTResponseType class UserApi: diff --git a/src/jaqpot_api_client/api/user_settings0_api.py b/src/jaqpot_api_client/api/user_settings0_api.py index c0132e9..9f80438 100644 --- a/src/jaqpot_api_client/api/user_settings0_api.py +++ b/src/jaqpot_api_client/api/user_settings0_api.py @@ -17,11 +17,11 @@ from typing import Any, Dict, List, Optional, Tuple, Union from typing_extensions import Annotated -from src.jaqpot_api_client.models.user_settings import UserSettings +from jaqpot_api_client.models.user_settings import UserSettings -from src.jaqpot_api_client.api_client import ApiClient, RequestSerialized -from src.jaqpot_api_client.api_response import ApiResponse -from src.jaqpot_api_client.rest import RESTResponseType +from jaqpot_api_client.api_client import ApiClient, RequestSerialized +from jaqpot_api_client.api_response import ApiResponse +from jaqpot_api_client.rest import RESTResponseType class UserSettingsApi: diff --git a/src/jaqpot_api_client/api/user_settings_api.py b/src/jaqpot_api_client/api/user_settings_api.py index a2712da..5823854 100644 --- a/src/jaqpot_api_client/api/user_settings_api.py +++ b/src/jaqpot_api_client/api/user_settings_api.py @@ -17,11 +17,11 @@ from typing import Any, Dict, List, Optional, Tuple, Union from typing_extensions import Annotated -from src.jaqpot_api_client.models.user_settings import UserSettings +from jaqpot_api_client.models.user_settings import UserSettings -from src.jaqpot_api_client.api_client import ApiClient, RequestSerialized -from src.jaqpot_api_client.api_response import ApiResponse -from src.jaqpot_api_client.rest import RESTResponseType +from jaqpot_api_client.api_client import ApiClient, RequestSerialized +from jaqpot_api_client.api_response import ApiResponse +from jaqpot_api_client.rest import RESTResponseType class UserSettingsApi: diff --git a/src/jaqpot_api_client/api_client.py b/src/jaqpot_api_client/api_client.py index fe2812a..04f11a0 100644 --- a/src/jaqpot_api_client/api_client.py +++ b/src/jaqpot_api_client/api_client.py @@ -27,11 +27,11 @@ from typing import Tuple, Optional, List, Dict, Union from pydantic import SecretStr -from src.jaqpot_api_client.configuration import Configuration -from src.jaqpot_api_client.api_response import ApiResponse, T as ApiResponseT -import src.jaqpot_api_client.models -from src.jaqpot_api_client import rest -from src.jaqpot_api_client.exceptions import ( +from jaqpot_api_client.configuration import Configuration +from jaqpot_api_client.api_response import ApiResponse, T as ApiResponseT +import jaqpot_api_client.models +from jaqpot_api_client import rest +from jaqpot_api_client.exceptions import ( ApiValueError, ApiException, BadRequestException, @@ -450,7 +450,7 @@ def __deserialize(self, data, klass): if klass in self.NATIVE_TYPES_MAPPING: klass = self.NATIVE_TYPES_MAPPING[klass] else: - klass = getattr(src.jaqpot_api_client.models, klass) + klass = getattr(jaqpot_api_client.models, klass) if klass in self.PRIMITIVE_TYPES: return self.__deserialize_primitive(data, klass) diff --git a/src/jaqpot_api_client/configuration.py b/src/jaqpot_api_client/configuration.py index e28aa31..e6bae02 100644 --- a/src/jaqpot_api_client/configuration.py +++ b/src/jaqpot_api_client/configuration.py @@ -231,7 +231,7 @@ def __init__( self.logger = {} """Logging Settings """ - self.logger["package_logger"] = logging.getLogger("src.jaqpot_api_client") + self.logger["package_logger"] = logging.getLogger("jaqpot_api_client") self.logger["urllib3_logger"] = logging.getLogger("urllib3") self.logger_format = '%(asctime)s %(levelname)s %(message)s' """Log format diff --git a/src/jaqpot_api_client/models/__init__.py b/src/jaqpot_api_client/models/__init__.py index 28d4969..9531fd0 100644 --- a/src/jaqpot_api_client/models/__init__.py +++ b/src/jaqpot_api_client/models/__init__.py @@ -15,58 +15,58 @@ # import models into model package -from src.jaqpot_api_client.models.api_key import ApiKey -from src.jaqpot_api_client.models.archive_model200_response import ArchiveModel200Response -from src.jaqpot_api_client.models.binary_classification_scores import BinaryClassificationScores -from src.jaqpot_api_client.models.bounding_box_doa import BoundingBoxDoa -from src.jaqpot_api_client.models.city_block_doa import CityBlockDoa -from src.jaqpot_api_client.models.create_api_key201_response import CreateApiKey201Response -from src.jaqpot_api_client.models.create_invitations_request import CreateInvitationsRequest -from src.jaqpot_api_client.models.dataset import Dataset -from src.jaqpot_api_client.models.dataset_csv import DatasetCSV -from src.jaqpot_api_client.models.dataset_type import DatasetType -from src.jaqpot_api_client.models.doa import Doa -from src.jaqpot_api_client.models.doa_method import DoaMethod -from src.jaqpot_api_client.models.error_code import ErrorCode -from src.jaqpot_api_client.models.error_response import ErrorResponse -from src.jaqpot_api_client.models.feature import Feature -from src.jaqpot_api_client.models.feature_possible_value import FeaturePossibleValue -from src.jaqpot_api_client.models.feature_type import FeatureType -from src.jaqpot_api_client.models.get_all_api_keys_for_user200_response_inner import GetAllApiKeysForUser200ResponseInner -from src.jaqpot_api_client.models.get_datasets200_response import GetDatasets200Response -from src.jaqpot_api_client.models.get_models200_response import GetModels200Response -from src.jaqpot_api_client.models.kernel_based_doa import KernelBasedDoa -from src.jaqpot_api_client.models.lead import Lead -from src.jaqpot_api_client.models.leverage_doa import LeverageDoa -from src.jaqpot_api_client.models.library import Library -from src.jaqpot_api_client.models.mahalanobis_doa import MahalanobisDoa -from src.jaqpot_api_client.models.mean_var_doa import MeanVarDoa -from src.jaqpot_api_client.models.model import Model -from src.jaqpot_api_client.models.model_scores import ModelScores -from src.jaqpot_api_client.models.model_summary import ModelSummary -from src.jaqpot_api_client.models.model_task import ModelTask -from src.jaqpot_api_client.models.model_type import ModelType -from src.jaqpot_api_client.models.model_visibility import ModelVisibility -from src.jaqpot_api_client.models.multiclass_classification_scores import MulticlassClassificationScores -from src.jaqpot_api_client.models.organization import Organization -from src.jaqpot_api_client.models.organization_invitation import OrganizationInvitation -from src.jaqpot_api_client.models.organization_summary import OrganizationSummary -from src.jaqpot_api_client.models.organization_user import OrganizationUser -from src.jaqpot_api_client.models.organization_user_association_type import OrganizationUserAssociationType -from src.jaqpot_api_client.models.organization_visibility import OrganizationVisibility -from src.jaqpot_api_client.models.partial_update_organization_request import PartialUpdateOrganizationRequest -from src.jaqpot_api_client.models.partially_update_model_feature_request import PartiallyUpdateModelFeatureRequest -from src.jaqpot_api_client.models.partially_update_model_request import PartiallyUpdateModelRequest -from src.jaqpot_api_client.models.prediction_doa import PredictionDoa -from src.jaqpot_api_client.models.prediction_model import PredictionModel -from src.jaqpot_api_client.models.prediction_request import PredictionRequest -from src.jaqpot_api_client.models.prediction_response import PredictionResponse -from src.jaqpot_api_client.models.r_pbpk_config import RPbpkConfig -from src.jaqpot_api_client.models.regression_scores import RegressionScores -from src.jaqpot_api_client.models.scores import Scores -from src.jaqpot_api_client.models.transformer import Transformer -from src.jaqpot_api_client.models.unarchive_model200_response import UnarchiveModel200Response -from src.jaqpot_api_client.models.update_api_key200_response import UpdateApiKey200Response -from src.jaqpot_api_client.models.update_api_key_request import UpdateApiKeyRequest -from src.jaqpot_api_client.models.user import User -from src.jaqpot_api_client.models.user_settings import UserSettings +from jaqpot_api_client.models.api_key import ApiKey +from jaqpot_api_client.models.archive_model200_response import ArchiveModel200Response +from jaqpot_api_client.models.binary_classification_scores import BinaryClassificationScores +from jaqpot_api_client.models.bounding_box_doa import BoundingBoxDoa +from jaqpot_api_client.models.city_block_doa import CityBlockDoa +from jaqpot_api_client.models.create_api_key201_response import CreateApiKey201Response +from jaqpot_api_client.models.create_invitations_request import CreateInvitationsRequest +from jaqpot_api_client.models.dataset import Dataset +from jaqpot_api_client.models.dataset_csv import DatasetCSV +from jaqpot_api_client.models.dataset_type import DatasetType +from jaqpot_api_client.models.doa import Doa +from jaqpot_api_client.models.doa_method import DoaMethod +from jaqpot_api_client.models.error_code import ErrorCode +from jaqpot_api_client.models.error_response import ErrorResponse +from jaqpot_api_client.models.feature import Feature +from jaqpot_api_client.models.feature_possible_value import FeaturePossibleValue +from jaqpot_api_client.models.feature_type import FeatureType +from jaqpot_api_client.models.get_all_api_keys_for_user200_response_inner import GetAllApiKeysForUser200ResponseInner +from jaqpot_api_client.models.get_datasets200_response import GetDatasets200Response +from jaqpot_api_client.models.get_models200_response import GetModels200Response +from jaqpot_api_client.models.kernel_based_doa import KernelBasedDoa +from jaqpot_api_client.models.lead import Lead +from jaqpot_api_client.models.leverage_doa import LeverageDoa +from jaqpot_api_client.models.library import Library +from jaqpot_api_client.models.mahalanobis_doa import MahalanobisDoa +from jaqpot_api_client.models.mean_var_doa import MeanVarDoa +from jaqpot_api_client.models.model import Model +from jaqpot_api_client.models.model_scores import ModelScores +from jaqpot_api_client.models.model_summary import ModelSummary +from jaqpot_api_client.models.model_task import ModelTask +from jaqpot_api_client.models.model_type import ModelType +from jaqpot_api_client.models.model_visibility import ModelVisibility +from jaqpot_api_client.models.multiclass_classification_scores import MulticlassClassificationScores +from jaqpot_api_client.models.organization import Organization +from jaqpot_api_client.models.organization_invitation import OrganizationInvitation +from jaqpot_api_client.models.organization_summary import OrganizationSummary +from jaqpot_api_client.models.organization_user import OrganizationUser +from jaqpot_api_client.models.organization_user_association_type import OrganizationUserAssociationType +from jaqpot_api_client.models.organization_visibility import OrganizationVisibility +from jaqpot_api_client.models.partial_update_organization_request import PartialUpdateOrganizationRequest +from jaqpot_api_client.models.partially_update_model_feature_request import PartiallyUpdateModelFeatureRequest +from jaqpot_api_client.models.partially_update_model_request import PartiallyUpdateModelRequest +from jaqpot_api_client.models.prediction_doa import PredictionDoa +from jaqpot_api_client.models.prediction_model import PredictionModel +from jaqpot_api_client.models.prediction_request import PredictionRequest +from jaqpot_api_client.models.prediction_response import PredictionResponse +from jaqpot_api_client.models.r_pbpk_config import RPbpkConfig +from jaqpot_api_client.models.regression_scores import RegressionScores +from jaqpot_api_client.models.scores import Scores +from jaqpot_api_client.models.transformer import Transformer +from jaqpot_api_client.models.unarchive_model200_response import UnarchiveModel200Response +from jaqpot_api_client.models.update_api_key200_response import UpdateApiKey200Response +from jaqpot_api_client.models.update_api_key_request import UpdateApiKeyRequest +from jaqpot_api_client.models.user import User +from jaqpot_api_client.models.user_settings import UserSettings diff --git a/src/jaqpot_api_client/models/city_block_doa.py b/src/jaqpot_api_client/models/city_block_doa.py index 6044536..94e5808 100644 --- a/src/jaqpot_api_client/models/city_block_doa.py +++ b/src/jaqpot_api_client/models/city_block_doa.py @@ -18,8 +18,9 @@ import re # noqa: F401 import json -from pydantic import BaseModel, ConfigDict -from typing import Any, ClassVar, Dict, List, Optional +from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt +from typing import Any, ClassVar, Dict, List, Optional, Union +from typing_extensions import Annotated from typing import Optional, Set from typing_extensions import Self @@ -27,8 +28,9 @@ class CityBlockDoa(BaseModel): """ CityBlockDoa """ # noqa: E501 - data: Optional[Dict[str, Any]] = None - __properties: ClassVar[List[str]] = ["data"] + mean_vector: Optional[Annotated[List[Union[StrictFloat, StrictInt]], Field(max_length=5000)]] = Field(default=None, alias="meanVector") + threshold: Optional[Union[StrictFloat, StrictInt]] = None + __properties: ClassVar[List[str]] = ["meanVector", "threshold"] model_config = ConfigDict( populate_by_name=True, @@ -81,7 +83,8 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: return cls.model_validate(obj) _obj = cls.model_validate({ - "data": obj.get("data") + "meanVector": obj.get("meanVector"), + "threshold": obj.get("threshold") }) return _obj diff --git a/src/jaqpot_api_client/models/dataset.py b/src/jaqpot_api_client/models/dataset.py index 6733723..0956376 100644 --- a/src/jaqpot_api_client/models/dataset.py +++ b/src/jaqpot_api_client/models/dataset.py @@ -22,7 +22,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr, field_validator from typing import Any, ClassVar, Dict, List, Optional from typing_extensions import Annotated -from src.jaqpot_api_client.models.dataset_type import DatasetType +from jaqpot_api_client.models.dataset_type import DatasetType from typing import Optional, Set from typing_extensions import Self diff --git a/src/jaqpot_api_client/models/dataset_csv.py b/src/jaqpot_api_client/models/dataset_csv.py index 6efc376..96d61af 100644 --- a/src/jaqpot_api_client/models/dataset_csv.py +++ b/src/jaqpot_api_client/models/dataset_csv.py @@ -22,7 +22,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr, field_validator from typing import Any, ClassVar, Dict, List, Optional, Union from typing_extensions import Annotated -from src.jaqpot_api_client.models.dataset_type import DatasetType +from jaqpot_api_client.models.dataset_type import DatasetType from typing import Optional, Set from typing_extensions import Self diff --git a/src/jaqpot_api_client/models/doa.py b/src/jaqpot_api_client/models/doa.py index 2464cc2..51cac5d 100644 --- a/src/jaqpot_api_client/models/doa.py +++ b/src/jaqpot_api_client/models/doa.py @@ -21,7 +21,7 @@ from datetime import datetime from pydantic import BaseModel, ConfigDict, Field, StrictInt from typing import Any, ClassVar, Dict, List, Optional -from src.jaqpot_api_client.models.doa_method import DoaMethod +from jaqpot_api_client.models.doa_method import DoaMethod from typing import Optional, Set from typing_extensions import Self diff --git a/src/jaqpot_api_client/models/feature.py b/src/jaqpot_api_client/models/feature.py index ad000e9..b0afd2e 100644 --- a/src/jaqpot_api_client/models/feature.py +++ b/src/jaqpot_api_client/models/feature.py @@ -22,8 +22,8 @@ from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictInt, StrictStr, field_validator from typing import Any, ClassVar, Dict, List, Optional from typing_extensions import Annotated -from src.jaqpot_api_client.models.feature_possible_value import FeaturePossibleValue -from src.jaqpot_api_client.models.feature_type import FeatureType +from jaqpot_api_client.models.feature_possible_value import FeaturePossibleValue +from jaqpot_api_client.models.feature_type import FeatureType from typing import Optional, Set from typing_extensions import Self diff --git a/src/jaqpot_api_client/models/get_datasets200_response.py b/src/jaqpot_api_client/models/get_datasets200_response.py index f9277e2..b98fd8b 100644 --- a/src/jaqpot_api_client/models/get_datasets200_response.py +++ b/src/jaqpot_api_client/models/get_datasets200_response.py @@ -20,7 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt from typing import Any, ClassVar, Dict, List, Optional -from src.jaqpot_api_client.models.dataset import Dataset +from jaqpot_api_client.models.dataset import Dataset from typing import Optional, Set from typing_extensions import Self diff --git a/src/jaqpot_api_client/models/get_models200_response.py b/src/jaqpot_api_client/models/get_models200_response.py index 19ccf14..7a45bb8 100644 --- a/src/jaqpot_api_client/models/get_models200_response.py +++ b/src/jaqpot_api_client/models/get_models200_response.py @@ -20,7 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt from typing import Any, ClassVar, Dict, List, Optional -from src.jaqpot_api_client.models.model_summary import ModelSummary +from jaqpot_api_client.models.model_summary import ModelSummary from typing import Optional, Set from typing_extensions import Self diff --git a/src/jaqpot_api_client/models/kernel_based_doa.py b/src/jaqpot_api_client/models/kernel_based_doa.py index 7118e81..5d0d2d6 100644 --- a/src/jaqpot_api_client/models/kernel_based_doa.py +++ b/src/jaqpot_api_client/models/kernel_based_doa.py @@ -18,8 +18,8 @@ import re # noqa: F401 import json -from pydantic import BaseModel, ConfigDict -from typing import Any, ClassVar, Dict, List, Optional +from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt, StrictStr, field_validator +from typing import Any, ClassVar, Dict, List, Optional, Union from typing import Optional, Set from typing_extensions import Self @@ -27,8 +27,22 @@ class KernelBasedDoa(BaseModel): """ KernelBasedDoa """ # noqa: E501 - data: Optional[Dict[str, Any]] = None - __properties: ClassVar[List[str]] = ["data"] + sigma: Optional[Union[StrictFloat, StrictInt]] = None + gamma: Optional[Union[StrictFloat, StrictInt]] = None + threshold: Optional[Union[StrictFloat, StrictInt]] = None + kernel_type: Optional[StrictStr] = Field(default=None, alias="kernelType") + data_points: Optional[List[List[Union[StrictFloat, StrictInt]]]] = Field(default=None, alias="dataPoints") + __properties: ClassVar[List[str]] = ["sigma", "gamma", "threshold", "kernelType", "dataPoints"] + + @field_validator('kernel_type') + def kernel_type_validate_enum(cls, value): + """Validates the enum""" + if value is None: + return value + + if value not in set(['GAUSSIAN', 'RBF', 'LAPLACIAN', 'PERCENTILE', 'MEAN_STD']): + raise ValueError("must be one of enum values ('GAUSSIAN', 'RBF', 'LAPLACIAN', 'PERCENTILE', 'MEAN_STD')") + return value model_config = ConfigDict( populate_by_name=True, @@ -81,7 +95,11 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: return cls.model_validate(obj) _obj = cls.model_validate({ - "data": obj.get("data") + "sigma": obj.get("sigma"), + "gamma": obj.get("gamma"), + "threshold": obj.get("threshold"), + "kernelType": obj.get("kernelType"), + "dataPoints": obj.get("dataPoints") }) return _obj diff --git a/src/jaqpot_api_client/models/mahalanobis_doa.py b/src/jaqpot_api_client/models/mahalanobis_doa.py index 4a7b7b4..480cddd 100644 --- a/src/jaqpot_api_client/models/mahalanobis_doa.py +++ b/src/jaqpot_api_client/models/mahalanobis_doa.py @@ -18,8 +18,8 @@ import re # noqa: F401 import json -from pydantic import BaseModel, ConfigDict -from typing import Any, ClassVar, Dict, List, Optional +from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt +from typing import Any, ClassVar, Dict, List, Optional, Union from typing import Optional, Set from typing_extensions import Self @@ -27,8 +27,10 @@ class MahalanobisDoa(BaseModel): """ MahalanobisDoa """ # noqa: E501 - data: Optional[Dict[str, Any]] = None - __properties: ClassVar[List[str]] = ["data"] + mean_vector: Optional[List[Union[StrictFloat, StrictInt]]] = Field(default=None, alias="meanVector") + inv_cov_matrix: Optional[List[List[Union[StrictFloat, StrictInt]]]] = Field(default=None, alias="invCovMatrix") + threshold: Optional[Union[StrictFloat, StrictInt]] = None + __properties: ClassVar[List[str]] = ["meanVector", "invCovMatrix", "threshold"] model_config = ConfigDict( populate_by_name=True, @@ -81,7 +83,9 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: return cls.model_validate(obj) _obj = cls.model_validate({ - "data": obj.get("data") + "meanVector": obj.get("meanVector"), + "invCovMatrix": obj.get("invCovMatrix"), + "threshold": obj.get("threshold") }) return _obj diff --git a/src/jaqpot_api_client/models/model.py b/src/jaqpot_api_client/models/model.py index cef35b5..1c566c0 100644 --- a/src/jaqpot_api_client/models/model.py +++ b/src/jaqpot_api_client/models/model.py @@ -22,17 +22,17 @@ from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional, Union from typing_extensions import Annotated -from src.jaqpot_api_client.models.doa import Doa -from src.jaqpot_api_client.models.feature import Feature -from src.jaqpot_api_client.models.library import Library -from src.jaqpot_api_client.models.model_scores import ModelScores -from src.jaqpot_api_client.models.model_task import ModelTask -from src.jaqpot_api_client.models.model_type import ModelType -from src.jaqpot_api_client.models.model_visibility import ModelVisibility -from src.jaqpot_api_client.models.organization import Organization -from src.jaqpot_api_client.models.r_pbpk_config import RPbpkConfig -from src.jaqpot_api_client.models.transformer import Transformer -from src.jaqpot_api_client.models.user import User +from jaqpot_api_client.models.doa import Doa +from jaqpot_api_client.models.feature import Feature +from jaqpot_api_client.models.library import Library +from jaqpot_api_client.models.model_scores import ModelScores +from jaqpot_api_client.models.model_task import ModelTask +from jaqpot_api_client.models.model_type import ModelType +from jaqpot_api_client.models.model_visibility import ModelVisibility +from jaqpot_api_client.models.organization import Organization +from jaqpot_api_client.models.r_pbpk_config import RPbpkConfig +from jaqpot_api_client.models.transformer import Transformer +from jaqpot_api_client.models.user import User from typing import Optional, Set from typing_extensions import Self diff --git a/src/jaqpot_api_client/models/model_scores.py b/src/jaqpot_api_client/models/model_scores.py index 4296077..31f373e 100644 --- a/src/jaqpot_api_client/models/model_scores.py +++ b/src/jaqpot_api_client/models/model_scores.py @@ -20,7 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional -from src.jaqpot_api_client.models.scores import Scores +from jaqpot_api_client.models.scores import Scores from typing import Optional, Set from typing_extensions import Self diff --git a/src/jaqpot_api_client/models/model_summary.py b/src/jaqpot_api_client/models/model_summary.py index c1ece19..e71ae31 100644 --- a/src/jaqpot_api_client/models/model_summary.py +++ b/src/jaqpot_api_client/models/model_summary.py @@ -22,10 +22,10 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt from typing import Any, ClassVar, Dict, List, Optional from typing_extensions import Annotated -from src.jaqpot_api_client.models.model_type import ModelType -from src.jaqpot_api_client.models.model_visibility import ModelVisibility -from src.jaqpot_api_client.models.organization_summary import OrganizationSummary -from src.jaqpot_api_client.models.user import User +from jaqpot_api_client.models.model_type import ModelType +from jaqpot_api_client.models.model_visibility import ModelVisibility +from jaqpot_api_client.models.organization_summary import OrganizationSummary +from jaqpot_api_client.models.user import User from typing import Optional, Set from typing_extensions import Self diff --git a/src/jaqpot_api_client/models/organization.py b/src/jaqpot_api_client/models/organization.py index a26e862..9da9608 100644 --- a/src/jaqpot_api_client/models/organization.py +++ b/src/jaqpot_api_client/models/organization.py @@ -22,9 +22,9 @@ from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictInt, StrictStr, field_validator from typing import Any, ClassVar, Dict, List, Optional from typing_extensions import Annotated -from src.jaqpot_api_client.models.organization_user import OrganizationUser -from src.jaqpot_api_client.models.organization_visibility import OrganizationVisibility -from src.jaqpot_api_client.models.user import User +from jaqpot_api_client.models.organization_user import OrganizationUser +from jaqpot_api_client.models.organization_visibility import OrganizationVisibility +from jaqpot_api_client.models.user import User from typing import Optional, Set from typing_extensions import Self diff --git a/src/jaqpot_api_client/models/organization_user.py b/src/jaqpot_api_client/models/organization_user.py index e56497b..7e8d23f 100644 --- a/src/jaqpot_api_client/models/organization_user.py +++ b/src/jaqpot_api_client/models/organization_user.py @@ -20,7 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from src.jaqpot_api_client.models.organization_user_association_type import OrganizationUserAssociationType +from jaqpot_api_client.models.organization_user_association_type import OrganizationUserAssociationType from typing import Optional, Set from typing_extensions import Self diff --git a/src/jaqpot_api_client/models/partial_update_organization_request.py b/src/jaqpot_api_client/models/partial_update_organization_request.py index 0287ec2..683579a 100644 --- a/src/jaqpot_api_client/models/partial_update_organization_request.py +++ b/src/jaqpot_api_client/models/partial_update_organization_request.py @@ -20,7 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from src.jaqpot_api_client.models.organization_visibility import OrganizationVisibility +from jaqpot_api_client.models.organization_visibility import OrganizationVisibility from typing import Optional, Set from typing_extensions import Self diff --git a/src/jaqpot_api_client/models/partially_update_model_feature_request.py b/src/jaqpot_api_client/models/partially_update_model_feature_request.py index 0ff0537..915e504 100644 --- a/src/jaqpot_api_client/models/partially_update_model_feature_request.py +++ b/src/jaqpot_api_client/models/partially_update_model_feature_request.py @@ -21,8 +21,8 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional from typing_extensions import Annotated -from src.jaqpot_api_client.models.feature_possible_value import FeaturePossibleValue -from src.jaqpot_api_client.models.feature_type import FeatureType +from jaqpot_api_client.models.feature_possible_value import FeaturePossibleValue +from jaqpot_api_client.models.feature_type import FeatureType from typing import Optional, Set from typing_extensions import Self diff --git a/src/jaqpot_api_client/models/partially_update_model_request.py b/src/jaqpot_api_client/models/partially_update_model_request.py index 51abcb3..fea941d 100644 --- a/src/jaqpot_api_client/models/partially_update_model_request.py +++ b/src/jaqpot_api_client/models/partially_update_model_request.py @@ -21,8 +21,8 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt from typing import Any, ClassVar, Dict, List, Optional from typing_extensions import Annotated -from src.jaqpot_api_client.models.model_task import ModelTask -from src.jaqpot_api_client.models.model_visibility import ModelVisibility +from jaqpot_api_client.models.model_task import ModelTask +from jaqpot_api_client.models.model_visibility import ModelVisibility from typing import Optional, Set from typing_extensions import Self diff --git a/src/jaqpot_api_client/models/prediction_doa.py b/src/jaqpot_api_client/models/prediction_doa.py index 0e1c420..c594e9c 100644 --- a/src/jaqpot_api_client/models/prediction_doa.py +++ b/src/jaqpot_api_client/models/prediction_doa.py @@ -21,7 +21,7 @@ from datetime import datetime from pydantic import BaseModel, ConfigDict, Field, StrictInt from typing import Any, ClassVar, Dict, List, Optional -from src.jaqpot_api_client.models.doa_method import DoaMethod +from jaqpot_api_client.models.doa_method import DoaMethod from typing import Optional, Set from typing_extensions import Self diff --git a/src/jaqpot_api_client/models/prediction_model.py b/src/jaqpot_api_client/models/prediction_model.py index e6a8f76..b454573 100644 --- a/src/jaqpot_api_client/models/prediction_model.py +++ b/src/jaqpot_api_client/models/prediction_model.py @@ -20,11 +20,11 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from src.jaqpot_api_client.models.feature import Feature -from src.jaqpot_api_client.models.model_task import ModelTask -from src.jaqpot_api_client.models.model_type import ModelType -from src.jaqpot_api_client.models.prediction_doa import PredictionDoa -from src.jaqpot_api_client.models.transformer import Transformer +from jaqpot_api_client.models.feature import Feature +from jaqpot_api_client.models.model_task import ModelTask +from jaqpot_api_client.models.model_type import ModelType +from jaqpot_api_client.models.prediction_doa import PredictionDoa +from jaqpot_api_client.models.transformer import Transformer from typing import Optional, Set from typing_extensions import Self diff --git a/src/jaqpot_api_client/models/prediction_request.py b/src/jaqpot_api_client/models/prediction_request.py index 054a0f4..8d2c877 100644 --- a/src/jaqpot_api_client/models/prediction_request.py +++ b/src/jaqpot_api_client/models/prediction_request.py @@ -20,8 +20,8 @@ from pydantic import BaseModel, ConfigDict from typing import Any, ClassVar, Dict, List -from src.jaqpot_api_client.models.dataset import Dataset -from src.jaqpot_api_client.models.prediction_model import PredictionModel +from jaqpot_api_client.models.dataset import Dataset +from jaqpot_api_client.models.prediction_model import PredictionModel from typing import Optional, Set from typing_extensions import Self diff --git a/src/jaqpot_api_client/models/scores.py b/src/jaqpot_api_client/models/scores.py index ed14a11..a45c848 100644 --- a/src/jaqpot_api_client/models/scores.py +++ b/src/jaqpot_api_client/models/scores.py @@ -20,9 +20,9 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List, Optional -from src.jaqpot_api_client.models.binary_classification_scores import BinaryClassificationScores -from src.jaqpot_api_client.models.multiclass_classification_scores import MulticlassClassificationScores -from src.jaqpot_api_client.models.regression_scores import RegressionScores +from jaqpot_api_client.models.binary_classification_scores import BinaryClassificationScores +from jaqpot_api_client.models.multiclass_classification_scores import MulticlassClassificationScores +from jaqpot_api_client.models.regression_scores import RegressionScores from typing import Optional, Set from typing_extensions import Self diff --git a/src/jaqpot_api_client/rest.py b/src/jaqpot_api_client/rest.py index ca07203..faf4738 100644 --- a/src/jaqpot_api_client/rest.py +++ b/src/jaqpot_api_client/rest.py @@ -20,7 +20,7 @@ import urllib3 -from src.jaqpot_api_client.exceptions import ApiException, ApiValueError +from jaqpot_api_client.exceptions import ApiException, ApiValueError SUPPORTED_SOCKS_PROXIES = {"socks5", "socks5h", "socks4", "socks4a"} RESTResponseType = urllib3.HTTPResponse