chore: all merlin client imports to caraml.generated

packages/caraml/models/batch/job.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import client
+import caraml.generated.merlin_client as client
 from enum import Enum
 
 from caraml.models.util import autostr

packages/caraml/models/client.py

@@ -18,7 +18,7 @@
 
 import urllib3
 from caraml_auth.id_token_credentials import get_default_id_token_credentials
-from generated.merlin_client import (
+from caraml.generated.merlin_client import (
     ApiClient,
     Configuration,
     EndpointApi,

packages/caraml/models/endpoint.py

@@ -15,7 +15,7 @@
 from enum import Enum
 from typing import Dict
 
-import client
+import caraml.generated.merlin_client as client
 from caraml.models.autoscaling import (RAW_DEPLOYMENT_DEFAULT_AUTOSCALING_POLICY,
                                 SERVERLESS_DEFAULT_AUTOSCALING_POLICY,
                                 AutoscalingPolicy, MetricsType)

packages/caraml/models/fluent.py

@@ -16,7 +16,8 @@
 from contextlib import contextmanager
 from typing import Any, Dict, List, Optional
 
-from client import PredictionJob
+from caraml.generated.merlin_client import PredictionJob
+
 from caraml.models.autoscaling import AutoscalingPolicy
 from caraml.models.batch.config import PredictionJobConfig
 from caraml.models.client import MerlinClient

packages/caraml/models/logger.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from enum import Enum
-import client
+import caraml.generated.merlin_client as client
 from caraml.models.util import autostr
 from typing import Optional
 

packages/caraml/models/merlin.py

@@ -15,7 +15,7 @@
 import click
 import warnings
 import os
-import merlin
+import caraml.models as merlin
 from caraml.models.model import ModelType
 from cookiecutter.main import cookiecutter
 from caraml.models.util import valid_name_check

packages/caraml/models/model.py

@@ -24,12 +24,12 @@
 from time import sleep
 from typing import Any, Dict, List, Optional, Tuple, Union
 
-import client
+import caraml.generated.merlin_client as client
 import docker
 import mlflow
 import pyprind
 import yaml
-from client import (
+from caraml.generated.merlin_client import (
     EndpointApi,
     EnvironmentApi,
     ModelEndpointsApi,

packages/caraml/models/transformer.py

@@ -21,7 +21,6 @@
 
 from enum import Enum
 
-import client
 import yaml
 import json
 

packages/caraml/tests/models/client_test.py

@@ -19,8 +19,8 @@
 
 import pytest
 
-import client as cl
-from client import ApiClient, Configuration
+import caraml.generated.merlin_client as cl
+from caraml.generated.merlin_client import ApiClient, Configuration
 from caraml.models.client import MerlinClient
 from caraml.models.endpoint import Status
 from caraml.models.model import Model, ModelType, Project

packages/caraml/tests/models/conftest.py

@@ -21,8 +21,8 @@
 from requests.packages.urllib3.util.retry import Retry
 from urllib3_mock import Responses
 
-import client as cl
-from client import ApiClient, Configuration
+import caraml.generated.merlin_client as cl
+from caraml.generated.merlin_client import ApiClient, Configuration
 from caraml.models.model import Model, ModelType, ModelVersion, Project
 
 

packages/caraml/tests/models/logger_test.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import pytest
-import client
+import caraml.generated.merlin_client as client
 from caraml.models.logger import Logger,LoggerMode,LoggerConfig,PredictionLoggerConfig
 
 

packages/caraml/tests/models/merlin_test.py

@@ -17,7 +17,7 @@
 import mlflow
 import pytest
 
-import client as cl
+import caraml.generated.merlin_client as cl
 import caraml.models as merlin
 from caraml.models.model import ModelVersion
 

packages/caraml/tests/models/model_test.py

@@ -16,8 +16,8 @@
 import types
 from unittest.mock import patch
 
-import client
-import client as cl
+import caraml.generated.merlin_client as client
+import caraml.generated.merlin_client as cl
 import caraml.models as merlin
 import pytest
 from caraml.models import AutoscalingPolicy, DeploymentMode, MetricsType