fix: packageName

ntua-unit-of-control-and-informatics · Dec 4, 2024 · a5265bc · a5265bc
1 parent 4e881da
commit a5265bc
Show file tree

Hide file tree

Showing 39 changed files with 294 additions and 269 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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: