Move helm.proxy.clients to helm.clients (#2413)

stanford-crfm · Feb 28, 2024 · 844ab8d · 844ab8d
1 parent 06263b1
commit 844ab8d
Show file tree

Hide file tree

Showing 114 changed files with 255 additions and 255 deletions.
diff --git a/docs/adding_new_models.md b/docs/adding_new_models.md
@@ -60,7 +60,7 @@ model_deployments:
     tokenizer_name: simple/model1
     max_sequence_length: 2048
     client_spec:
-      class_name: "helm.proxy.clients.simple_client.SimpleClient"
+      class_name: "helm.clients.simple_client.SimpleClient"
       args: {}
     window_service_spec:
       class_name: "helm.benchmark.window_services.openai_window_service.OpenAIWindowService"

diff --git a/scripts/cache/fix_anthropic_cache.py b/scripts/cache/fix_anthropic_cache.py
@@ -6,7 +6,7 @@
 from helm.common.cache import create_key_value_store, MongoCacheConfig
 from helm.common.general import parse_hocon
 from helm.common.hierarchical_logger import hlog, htrack
-from helm.proxy.clients.anthropic_client import AnthropicLegacyClient
+from helm.clients.anthropic_client import AnthropicLegacyClient
 from helm.proxy.retry import get_retry_decorator
 
 

diff --git a/scripts/compute_request_limits.py b/scripts/compute_request_limits.py
@@ -6,14 +6,14 @@
 from typing import Any, Optional, Dict
 from helm.common.cache_backend_config import SqliteCacheBackendConfig
 from helm.common.general import ensure_directory_exists
-from helm.proxy.clients.auto_client import AutoClient
+from helm.clients.auto_client import AutoClient
 from helm.benchmark.model_deployment_registry import ModelDeployment, get_model_deployment
 from helm.tokenizers.auto_tokenizer import AutoTokenizer
 from helm.common.request import Request
 from helm.common.tokenization_request import TokenizationRequest
 
 # TODO #1592: reenable this once the imports are faster
-# from helm.proxy.clients.client import Client
+# from helm.clients.client import Client
 from helm.tokenizers.tokenizer import Tokenizer
 
 import os

diff --git a/scripts/offline_eval/deepfloyd/deepfloyd.py b/scripts/offline_eval/deepfloyd/deepfloyd.py
@@ -20,7 +20,7 @@
 from helm.common.request import Request
 from helm.common.file_caches.local_file_cache import LocalFileCache
 from helm.common.hierarchical_logger import hlog, htrack_block
-from helm.proxy.clients.image_generation.deep_floyd_client import DeepFloydClient
+from helm.clients.image_generation.deep_floyd_client import DeepFloydClient
 
 
 """

diff --git a/scripts/offline_eval/export_requests.py b/scripts/offline_eval/export_requests.py
@@ -15,9 +15,9 @@
 )
 from helm.common.key_value_store import request_to_key
 from helm.common.hierarchical_logger import hlog, htrack, htrack_block
-from helm.proxy.clients.google_client import GoogleClient
-from helm.proxy.clients.together_client import TogetherClient
-from helm.proxy.clients.microsoft_client import MicrosoftClient
+from helm.clients.google_client import GoogleClient
+from helm.clients.together_client import TogetherClient
+from helm.clients.microsoft_client import MicrosoftClient
 
 
 """

diff --git a/setup.cfg b/setup.cfg
@@ -257,8 +257,8 @@ exclude =
 max-line-length = 120
 exclude =
     venv/*
-    src/helm/proxy/clients/image_generation/dalle_mini/*
-    src/helm/proxy/clients/image_generation/mindalle/*
+    src/helm/clients/image_generation/dalle_mini/*
+    src/helm/clients/image_generation/mindalle/*
 
 # Ignore completely:
 # E203 - White space before ':', (conflicts with black)

diff --git a/src/helm/benchmark/augmentations/translate_perturbation.py b/src/helm/benchmark/augmentations/translate_perturbation.py
@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 from random import Random
 
-from helm.proxy.clients.google_translate_client import GoogleTranslateClient
+from helm.clients.google_translate_client import GoogleTranslateClient
 from .perturbation import TextPerturbation
 from .perturbation_description import PerturbationDescription
 

diff --git a/src/helm/benchmark/huggingface_registration.py b/src/helm/benchmark/huggingface_registration.py
@@ -40,7 +40,7 @@ def register_huggingface_model(
     model_deployment = ModelDeployment(
         name=helm_model_name,
         client_spec=ClientSpec(
-            class_name="helm.proxy.clients.huggingface_client.HuggingFaceClient",
+            class_name="helm.clients.huggingface_client.HuggingFaceClient",
             args=object_spec_args,
         ),
         model_name=helm_model_name,

diff --git a/src/helm/benchmark/metrics/cleva_harms_metrics.py b/src/helm/benchmark/metrics/cleva_harms_metrics.py
@@ -11,7 +11,7 @@
 from helm.benchmark.adaptation.request_state import RequestState
 from helm.benchmark.adaptation.adapter_spec import AdapterSpec
 from helm.benchmark.metrics.cleva_metrics_helper import ChineseTokenizer
-from helm.proxy.clients.perspective_api_client import PerspectiveAPIClientCredentialsError
+from helm.clients.perspective_api_client import PerspectiveAPIClientCredentialsError
 from helm.common.general import ensure_file_downloaded, ensure_directory_exists
 from helm.common.optional_dependencies import handle_module_not_found_error
 from .bias_metrics import BiasMetric

diff --git a/src/helm/benchmark/metrics/image_generation/nsfw_metrics.py b/src/helm/benchmark/metrics/image_generation/nsfw_metrics.py
@@ -8,7 +8,7 @@
 from helm.benchmark.metrics.metric_name import MetricName
 from helm.benchmark.metrics.metric_service import MetricService
 from helm.benchmark.metrics.toxicity_utils import is_prompt_toxic
-from helm.proxy.clients.image_generation.dalle2_client import DALLE2Client
+from helm.clients.image_generation.dalle2_client import DALLE2Client
 from helm.common.images_utils import is_blacked_out_image
 from .nsfw_detector import NSFWDetector
 

diff --git a/src/helm/benchmark/metrics/toxicity_metrics.py b/src/helm/benchmark/metrics/toxicity_metrics.py
@@ -5,7 +5,7 @@
 from helm.common.hierarchical_logger import hlog
 from helm.benchmark.adaptation.request_state import RequestState
 from helm.benchmark.adaptation.adapter_spec import AdapterSpec
-from helm.proxy.clients.perspective_api_client import PerspectiveAPIClientCredentialsError
+from helm.clients.perspective_api_client import PerspectiveAPIClientCredentialsError
 from .metric import Metric
 from .metric_name import MetricName
 from .metric_service import MetricService

diff --git a/src/helm/benchmark/test_model_deployment_definition.py b/src/helm/benchmark/test_model_deployment_definition.py
@@ -15,12 +15,12 @@
 from helm.benchmark.tokenizer_config_registry import TokenizerConfig, get_tokenizer_config
 from helm.benchmark.window_services.test_utils import get_tokenizer_service
 from helm.common.cache_backend_config import BlackHoleCacheBackendConfig
-from helm.proxy.clients.client import Client
+from helm.clients.client import Client
 from helm.tokenizers.tokenizer import Tokenizer
 from helm.benchmark.window_services.window_service import WindowService
 
 from helm.benchmark.window_services.window_service_factory import WindowServiceFactory
-from helm.proxy.clients.auto_client import AutoClient
+from helm.clients.auto_client import AutoClient
 from helm.tokenizers.auto_tokenizer import AutoTokenizer
 
 

diff --git a/src/helm/benchmark/window_services/image_generation/test_openai_dalle_window_service.py b/src/helm/benchmark/window_services/image_generation/test_openai_dalle_window_service.py
@@ -2,7 +2,7 @@
 import tempfile
 
 from helm.benchmark.window_services.tokenizer_service import TokenizerService
-from helm.proxy.clients.image_generation.dalle2_client import DALLE2Client
+from helm.clients.image_generation.dalle2_client import DALLE2Client
 from helm.benchmark.window_services.test_utils import get_tokenizer_service, TEST_PROMPT
 from helm.benchmark.window_services.window_service_factory import WindowServiceFactory
 from helm.common.cache_backend_config import BlackHoleCacheBackendConfig

diff --git a/src/helm/benchmark/window_services/local_window_service.py b/src/helm/benchmark/window_services/local_window_service.py
@@ -10,7 +10,7 @@
     TokenizationRequestResult,
     TokenizationToken,
 )
-from helm.proxy.clients.client import cleanup_tokens
+from helm.clients.client import cleanup_tokens
 
 
 class LocalWindowService(ConfigurableWindowService, ABC):

diff --git a/src/helm/proxy/clients/__init__.py → src/helm/clients/__init__.py b/src/helm/proxy/clients/__init__.py → src/helm/clients/__init__.py
diff --git a/src/helm/proxy/clients/ai21_client.py → src/helm/clients/ai21_client.py b/src/helm/proxy/clients/ai21_client.py → src/helm/clients/ai21_client.py
diff --git a/src/helm/proxy/clients/ai21_utils.py → src/helm/clients/ai21_utils.py b/src/helm/proxy/clients/ai21_utils.py → src/helm/clients/ai21_utils.py
diff --git a/src/helm/proxy/clients/aleph_alpha_client.py → src/helm/clients/aleph_alpha_client.py b/src/helm/proxy/clients/aleph_alpha_client.py → src/helm/clients/aleph_alpha_client.py
diff --git a/src/helm/proxy/clients/anthropic_client.py → src/helm/clients/anthropic_client.py b/src/helm/proxy/clients/anthropic_client.py → src/helm/clients/anthropic_client.py
diff --git a/src/helm/proxy/clients/auto_client.py → src/helm/clients/auto_client.py b/src/helm/proxy/clients/auto_client.py → src/helm/clients/auto_client.py
@@ -12,10 +12,10 @@
 from helm.common.hierarchical_logger import hlog
 from helm.common.object_spec import create_object, inject_object_spec_args
 from helm.common.request import Request, RequestResult
-from helm.proxy.clients.client import Client
-from helm.proxy.clients.moderation_api_client import ModerationAPIClient
+from helm.clients.client import Client
+from helm.clients.moderation_api_client import ModerationAPIClient
 from helm.proxy.critique.critique_client import CritiqueClient
-from helm.proxy.clients.toxicity_classifier_client import ToxicityClassifierClient
+from helm.clients.toxicity_classifier_client import ToxicityClassifierClient
 from helm.proxy.retry import NonRetriableException, retry_request
 from helm.tokenizers.auto_tokenizer import AutoTokenizer
 
@@ -133,7 +133,7 @@ def get_gcs_client(self):
         return GCSClient(bucket_name, cache_config)
 
     def get_nudity_check_client(self):
-        from helm.proxy.clients.image_generation.nudity_check_client import NudityCheckClient
+        from helm.clients.image_generation.nudity_check_client import NudityCheckClient
 
         cache_config: CacheConfig = self.cache_backend_config.get_cache_config("nudity")
         return NudityCheckClient(cache_config)
@@ -146,7 +146,7 @@ def get_clip_score_client(self):
 
     def get_toxicity_classifier_client(self) -> ToxicityClassifierClient:
         """Get the toxicity classifier client. We currently only support Perspective API."""
-        from helm.proxy.clients.perspective_api_client import PerspectiveAPIClient
+        from helm.clients.perspective_api_client import PerspectiveAPIClient
 
         cache_config: CacheConfig = self.cache_backend_config.get_cache_config("perspectiveapi")
         return PerspectiveAPIClient(self.credentials.get("perspectiveApiKey", ""), cache_config)

diff --git a/src/helm/proxy/clients/bedrock_client.py → src/helm/clients/bedrock_client.py b/src/helm/proxy/clients/bedrock_client.py → src/helm/clients/bedrock_client.py
@@ -5,9 +5,9 @@
 from typing import Any, Dict, List, Mapping, Optional
 
 from helm.common.cache import CacheConfig
-from helm.proxy.clients.client import CachingClient, truncate_and_tokenize_response_text
+from helm.clients.client import CachingClient, truncate_and_tokenize_response_text
 from helm.common.request import Request, RequestResult, Sequence, wrap_request_time
-from helm.proxy.clients.bedrock_utils import get_bedrock_client
+from helm.clients.bedrock_utils import get_bedrock_client
 from helm.tokenizers.tokenizer import Tokenizer
 
 

diff --git a/src/helm/proxy/clients/bedrock_utils.py → src/helm/clients/bedrock_utils.py b/src/helm/proxy/clients/bedrock_utils.py → src/helm/clients/bedrock_utils.py
diff --git a/src/helm/proxy/clients/client.py → src/helm/clients/client.py b/src/helm/proxy/clients/client.py → src/helm/clients/client.py
diff --git a/src/helm/proxy/clients/clip_score_client.py → src/helm/clients/clip_score_client.py b/src/helm/proxy/clients/clip_score_client.py → src/helm/clients/clip_score_client.py
@@ -3,7 +3,7 @@
 
 from helm.common.cache import Cache, CacheConfig
 from helm.common.clip_score_request import DEFAULT_CLIP_SCORE_MODEL, CLIPScoreRequest, CLIPScoreResult
-from helm.proxy.clients.clip_scorers.base_clip_scorer import BaseCLIPScorer
+from helm.clients.clip_scorers.base_clip_scorer import BaseCLIPScorer
 
 
 class CLIPScoreClientError(Exception):
@@ -27,7 +27,7 @@ def compute_score(self, request: CLIPScoreRequest) -> CLIPScoreResult:
 
             def do_it():
                 if self._clip_scorer is None:
-                    from helm.proxy.clients.clip_scorers.clip_scorer import CLIPScorer
+                    from helm.clients.clip_scorers.clip_scorer import CLIPScorer
 
                     self._clip_scorer = CLIPScorer()
 

diff --git a/...lm/proxy/clients/clip_scorers/__init__.py → src/helm/clients/clip_scorers/__init__.py b/...lm/proxy/clients/clip_scorers/__init__.py → src/helm/clients/clip_scorers/__init__.py
diff --git a/.../clients/clip_scorers/base_clip_scorer.py → .../clients/clip_scorers/base_clip_scorer.py b/.../clients/clip_scorers/base_clip_scorer.py → .../clients/clip_scorers/base_clip_scorer.py
diff --git a/...proxy/clients/clip_scorers/clip_scorer.py → src/helm/clients/clip_scorers/clip_scorer.py b/...proxy/clients/clip_scorers/clip_scorer.py → src/helm/clients/clip_scorers/clip_scorer.py
diff --git a/.../clip_scorers/multilingual_clip_scorer.py → .../clip_scorers/multilingual_clip_scorer.py b/.../clip_scorers/multilingual_clip_scorer.py → .../clip_scorers/multilingual_clip_scorer.py
diff --git a/src/helm/proxy/clients/cohere_client.py → src/helm/clients/cohere_client.py b/src/helm/proxy/clients/cohere_client.py → src/helm/clients/cohere_client.py
diff --git a/src/helm/proxy/clients/cohere_utils.py → src/helm/clients/cohere_utils.py b/src/helm/proxy/clients/cohere_utils.py → src/helm/clients/cohere_utils.py
diff --git a/src/helm/proxy/clients/gcs_client.py → src/helm/clients/gcs_client.py b/src/helm/proxy/clients/gcs_client.py → src/helm/clients/gcs_client.py
diff --git a/src/helm/proxy/clients/google_client.py → src/helm/clients/google_client.py b/src/helm/proxy/clients/google_client.py → src/helm/clients/google_client.py
diff --git a/.../proxy/clients/google_translate_client.py → src/helm/clients/google_translate_client.py b/.../proxy/clients/google_translate_client.py → src/helm/clients/google_translate_client.py
diff --git a/src/helm/proxy/clients/http_model_client.py → src/helm/clients/http_model_client.py b/src/helm/proxy/clients/http_model_client.py → src/helm/clients/http_model_client.py
diff --git a/src/helm/proxy/clients/huggingface_client.py → src/helm/clients/huggingface_client.py b/src/helm/proxy/clients/huggingface_client.py → src/helm/clients/huggingface_client.py
diff --git a/...roxy/clients/image_generation/__init__.py → ...helm/clients/image_generation/__init__.py b/...roxy/clients/image_generation/__init__.py → ...helm/clients/image_generation/__init__.py
diff --git a/...s/image_generation/adobe_vision_client.py → ...s/image_generation/adobe_vision_client.py b/...s/image_generation/adobe_vision_client.py → ...s/image_generation/adobe_vision_client.py
@@ -8,7 +8,7 @@
     DecodeRequest,
     DecodeRequestResult,
 )
-from helm.proxy.clients.client import Client, CachingClient
+from helm.clients.client import Client, CachingClient
 from .image_generation_client_utils import get_single_image_multimedia_object
 
 

diff --git a/...on/aleph_alpha_image_generation_client.py → ...on/aleph_alpha_image_generation_client.py b/...on/aleph_alpha_image_generation_client.py → ...on/aleph_alpha_image_generation_client.py
@@ -8,7 +8,7 @@
     DecodeRequest,
     DecodeRequestResult,
 )
-from helm.proxy.clients.client import Client, CachingClient
+from helm.clients.client import Client, CachingClient
 from .image_generation_client_utils import get_single_image_multimedia_object
 
 

diff --git a/...nts/image_generation/cogview2/__init__.py → ...nts/image_generation/cogview2/__init__.py b/...nts/image_generation/cogview2/__init__.py → ...nts/image_generation/cogview2/__init__.py
diff --git a/...age_generation/cogview2/cluster_label.npy → ...age_generation/cogview2/cluster_label.npy b/...age_generation/cogview2/cluster_label.npy → ...age_generation/cogview2/cluster_label.npy
diff --git a/...age_generation/cogview2/coglm_strategy.py → ...age_generation/cogview2/coglm_strategy.py b/...age_generation/cogview2/coglm_strategy.py → ...age_generation/cogview2/coglm_strategy.py
diff --git a/.../image_generation/cogview2/coglm_utils.py → .../image_generation/cogview2/coglm_utils.py b/.../image_generation/cogview2/coglm_utils.py → .../image_generation/cogview2/coglm_utils.py
diff --git a/...neration/cogview2/sr_pipeline/__init__.py → ...neration/cogview2/sr_pipeline/__init__.py b/...neration/cogview2/sr_pipeline/__init__.py → ...neration/cogview2/sr_pipeline/__init__.py
diff --git a/...eration/cogview2/sr_pipeline/direct_sr.py → ...eration/cogview2/sr_pipeline/direct_sr.py b/...eration/cogview2/sr_pipeline/direct_sr.py → ...eration/cogview2/sr_pipeline/direct_sr.py
diff --git a/...eration/cogview2/sr_pipeline/dsr_model.py → ...eration/cogview2/sr_pipeline/dsr_model.py b/...eration/cogview2/sr_pipeline/dsr_model.py → ...eration/cogview2/sr_pipeline/dsr_model.py
diff --git a/...tion/cogview2/sr_pipeline/dsr_sampling.py → ...tion/cogview2/sr_pipeline/dsr_sampling.py b/...tion/cogview2/sr_pipeline/dsr_sampling.py → ...tion/cogview2/sr_pipeline/dsr_sampling.py
diff --git a/...tion/cogview2/sr_pipeline/iterative_sr.py → ...tion/cogview2/sr_pipeline/iterative_sr.py b/...tion/cogview2/sr_pipeline/iterative_sr.py → ...tion/cogview2/sr_pipeline/iterative_sr.py
diff --git a/...tion/cogview2/sr_pipeline/itersr_model.py → ...tion/cogview2/sr_pipeline/itersr_model.py b/...tion/cogview2/sr_pipeline/itersr_model.py → ...tion/cogview2/sr_pipeline/itersr_model.py
diff --git a/...n/cogview2/sr_pipeline/itersr_sampling.py → ...n/cogview2/sr_pipeline/itersr_sampling.py b/...n/cogview2/sr_pipeline/itersr_sampling.py → ...n/cogview2/sr_pipeline/itersr_sampling.py
diff --git a/...neration/cogview2/sr_pipeline/sr_group.py → ...neration/cogview2/sr_pipeline/sr_group.py b/...neration/cogview2/sr_pipeline/sr_group.py → ...neration/cogview2/sr_pipeline/sr_group.py
diff --git a/...ients/image_generation/cogview2_client.py → ...ients/image_generation/cogview2_client.py b/...ients/image_generation/cogview2_client.py → ...ients/image_generation/cogview2_client.py
@@ -18,8 +18,8 @@
     TokenizationRequest,
     TokenizationRequestResult,
 )
-from helm.proxy.clients.client import Client, CachingClient
-from helm.proxy.clients.image_generation.cogview2.coglm_strategy import CoglmStrategy
+from helm.clients.client import Client, CachingClient
+from helm.clients.image_generation.cogview2.coglm_strategy import CoglmStrategy
 from .image_generation_client_utils import get_single_image_multimedia_object
 
 
@@ -43,11 +43,11 @@ def __init__(self, cache_config: CacheConfig, file_cache: FileCache):
     def _get_model(self) -> None:
         try:
             from SwissArmyTransformer import get_args
-            from helm.proxy.clients.image_generation.cogview2.coglm_utils import (
+            from helm.clients.image_generation.cogview2.coglm_utils import (
                 get_recipe,
                 InferenceModel,
             )
-            from helm.proxy.clients.image_generation.cogview2.sr_pipeline import SRGroup
+            from helm.clients.image_generation.cogview2.sr_pipeline import SRGroup
         except ModuleNotFoundError as e:
             handle_module_not_found_error(e, ["heim"])
 
@@ -86,7 +86,7 @@ def _get_model(self) -> None:
     def _model_inference(self, prompt) -> torch.Tensor:
         try:
             from SwissArmyTransformer.generation.autoregressive_sampling import filling_sequence
-            from helm.proxy.clients.image_generation.cogview2.coglm_utils import get_masks_and_position_ids_coglm
+            from helm.clients.image_generation.cogview2.coglm_utils import get_masks_and_position_ids_coglm
         except ModuleNotFoundError as e:
             handle_module_not_found_error(e, ["heim"])
 

diff --git a/...clients/image_generation/dalle2_client.py → ...clients/image_generation/dalle2_client.py b/...clients/image_generation/dalle2_client.py → ...clients/image_generation/dalle2_client.py
@@ -13,8 +13,8 @@
     DecodeRequest,
     DecodeRequestResult,
 )
-from helm.proxy.clients.moderation_api_client import ModerationAPIClient
-from helm.proxy.clients.client import Client, CachingClient
+from helm.clients.moderation_api_client import ModerationAPIClient
+from helm.clients.client import Client, CachingClient
 from .image_generation_client_utils import get_single_image_multimedia_object
 
 try:

diff --git a/...clients/image_generation/dalle3_client.py → ...clients/image_generation/dalle3_client.py b/...clients/image_generation/dalle3_client.py → ...clients/image_generation/dalle3_client.py
@@ -5,8 +5,8 @@
 from helm.common.general import singleton
 from helm.common.optional_dependencies import handle_module_not_found_error
 from helm.common.request import Request, RequestResult, Sequence, wrap_request_time
-from helm.proxy.clients.moderation_api_client import ModerationAPIClient
-from helm.proxy.clients.client import CachingClient
+from helm.clients.moderation_api_client import ModerationAPIClient
+from helm.clients.client import CachingClient
 from .dalle2_client import DALLE2Client
 from .image_generation_client_utils import get_single_image_multimedia_object
 

diff --git a/...s/image_generation/dalle_mini/__init__.py → ...s/image_generation/dalle_mini/__init__.py b/...s/image_generation/dalle_mini/__init__.py → ...s/image_generation/dalle_mini/__init__.py
diff --git a/...ients/image_generation/dalle_mini/data.py → ...ients/image_generation/dalle_mini/data.py b/...ients/image_generation/dalle_mini/data.py → ...ients/image_generation/dalle_mini/data.py
diff --git a/...e_generation/dalle_mini/model/__init__.py → ...e_generation/dalle_mini/model/__init__.py b/...e_generation/dalle_mini/model/__init__.py → ...e_generation/dalle_mini/model/__init__.py
diff --git a/...eration/dalle_mini/model/configuration.py → ...eration/dalle_mini/model/configuration.py b/...eration/dalle_mini/model/configuration.py → ...eration/dalle_mini/model/configuration.py
diff --git a/...e_generation/dalle_mini/model/modeling.py → ...e_generation/dalle_mini/model/modeling.py b/...e_generation/dalle_mini/model/modeling.py → ...e_generation/dalle_mini/model/modeling.py
diff --git a/...generation/dalle_mini/model/partitions.py → ...generation/dalle_mini/model/partitions.py b/...generation/dalle_mini/model/partitions.py → ...generation/dalle_mini/model/partitions.py
diff --git a/..._generation/dalle_mini/model/processor.py → ..._generation/dalle_mini/model/processor.py b/..._generation/dalle_mini/model/processor.py → ..._generation/dalle_mini/model/processor.py
diff --git a/...image_generation/dalle_mini/model/text.py → ...image_generation/dalle_mini/model/text.py b/...image_generation/dalle_mini/model/text.py → ...image_generation/dalle_mini/model/text.py
diff --git a/..._generation/dalle_mini/model/tokenizer.py → ..._generation/dalle_mini/model/tokenizer.py b/..._generation/dalle_mini/model/tokenizer.py → ..._generation/dalle_mini/model/tokenizer.py
diff --git a/...mage_generation/dalle_mini/model/utils.py → ...mage_generation/dalle_mini/model/utils.py b/...mage_generation/dalle_mini/model/utils.py → ...mage_generation/dalle_mini/model/utils.py
diff --git a/...neration/dalle_mini/vqgan_jax/__init__.py → ...neration/dalle_mini/vqgan_jax/__init__.py b/...neration/dalle_mini/vqgan_jax/__init__.py → ...neration/dalle_mini/vqgan_jax/__init__.py
diff --git a/...lle_mini/vqgan_jax/configuration_vqgan.py → ...lle_mini/vqgan_jax/configuration_vqgan.py b/...lle_mini/vqgan_jax/configuration_vqgan.py → ...lle_mini/vqgan_jax/configuration_vqgan.py
diff --git a/...mini/vqgan_jax/convert_pt_model_to_jax.py → ...mini/vqgan_jax/convert_pt_model_to_jax.py b/...mini/vqgan_jax/convert_pt_model_to_jax.py → ...mini/vqgan_jax/convert_pt_model_to_jax.py
diff --git a/...lle_mini/vqgan_jax/modeling_flax_vqgan.py → ...lle_mini/vqgan_jax/modeling_flax_vqgan.py b/...lle_mini/vqgan_jax/modeling_flax_vqgan.py → ...lle_mini/vqgan_jax/modeling_flax_vqgan.py
diff --git a/...nts/image_generation/dalle_mini_client.py → ...nts/image_generation/dalle_mini_client.py b/...nts/image_generation/dalle_mini_client.py → ...nts/image_generation/dalle_mini_client.py
@@ -14,7 +14,7 @@
     TokenizationRequest,
     TokenizationRequestResult,
 )
-from helm.proxy.clients.client import Client, CachingClient
+from helm.clients.client import Client, CachingClient
 from .image_generation_client_utils import get_single_image_multimedia_object
 
 
@@ -41,8 +41,8 @@ def _get_model(self, model_engine: str):
             import jax.numpy as jnp
             from flax.jax_utils import replicate
 
-            from helm.proxy.clients.image_generation.dalle_mini.vqgan_jax.modeling_flax_vqgan import VQModel
-            from helm.proxy.clients.image_generation.dalle_mini import DalleBart, DalleBartProcessor
+            from helm.clients.image_generation.dalle_mini.vqgan_jax.modeling_flax_vqgan import VQModel
+            from helm.clients.image_generation.dalle_mini import DalleBart, DalleBartProcessor
         except ModuleNotFoundError as e:
             handle_module_not_found_error(e, ["heim"])
 

diff --git a/...nts/image_generation/deep_floyd_client.py → ...nts/image_generation/deep_floyd_client.py b/...nts/image_generation/deep_floyd_client.py → ...nts/image_generation/deep_floyd_client.py
@@ -8,7 +8,7 @@
     DecodeRequest,
     DecodeRequestResult,
 )
-from helm.proxy.clients.client import Client, CachingClient
+from helm.clients.client import Client, CachingClient
 from .image_generation_client_utils import get_single_image_multimedia_object
 
 

diff --git a/...eneration/huggingface_diffusers_client.py → ...eneration/huggingface_diffusers_client.py b/...eneration/huggingface_diffusers_client.py → ...eneration/huggingface_diffusers_client.py
@@ -16,7 +16,7 @@
     TokenizationRequest,
     TokenizationRequestResult,
 )
-from helm.proxy.clients.client import Client, CachingClient
+from helm.clients.client import Client, CachingClient
 from .image_generation_client_utils import get_single_image_multimedia_object
 
 

diff --git a/...neration/image_generation_client_utils.py → ...neration/image_generation_client_utils.py b/...neration/image_generation_client_utils.py → ...neration/image_generation_client_utils.py
diff --git a/...clients/image_generation/lexica_client.py → ...clients/image_generation/lexica_client.py b/...clients/image_generation/lexica_client.py → ...clients/image_generation/lexica_client.py
@@ -13,7 +13,7 @@
     DecodeRequest,
     DecodeRequestResult,
 )
-from helm.proxy.clients.client import Client, CachingClient
+from helm.clients.client import Client, CachingClient
 from .image_generation_client_utils import get_single_image_multimedia_object
 
 

diff --git a/...nts/image_generation/mindalle/__init__.py → ...nts/image_generation/mindalle/__init__.py b/...nts/image_generation/mindalle/__init__.py → ...nts/image_generation/mindalle/__init__.py
diff --git a/...ge_generation/mindalle/models/__init__.py → ...ge_generation/mindalle/models/__init__.py b/...ge_generation/mindalle/models/__init__.py → ...ge_generation/mindalle/models/__init__.py
diff --git a/...ration/mindalle/models/stage1/__init__.py → ...ration/mindalle/models/stage1/__init__.py b/...ration/mindalle/models/stage1/__init__.py → ...ration/mindalle/models/stage1/__init__.py
diff --git a/...neration/mindalle/models/stage1/layers.py → ...neration/mindalle/models/stage1/layers.py b/...neration/mindalle/models/stage1/layers.py → ...neration/mindalle/models/stage1/layers.py
diff --git a/...eneration/mindalle/models/stage1/vqgan.py → ...eneration/mindalle/models/stage1/vqgan.py b/...eneration/mindalle/models/stage1/vqgan.py → ...eneration/mindalle/models/stage1/vqgan.py
diff --git a/...ration/mindalle/models/stage2/__init__.py → ...ration/mindalle/models/stage2/__init__.py b/...ration/mindalle/models/stage2/__init__.py → ...ration/mindalle/models/stage2/__init__.py
diff --git a/...neration/mindalle/models/stage2/layers.py → ...neration/mindalle/models/stage2/layers.py b/...neration/mindalle/models/stage2/layers.py → ...neration/mindalle/models/stage2/layers.py
diff --git a/...ion/mindalle/models/stage2/transformer.py → ...ion/mindalle/models/stage2/transformer.py b/...ion/mindalle/models/stage2/transformer.py → ...ion/mindalle/models/stage2/transformer.py
diff --git a/...e_generation/mindalle/models/tokenizer.py → ...e_generation/mindalle/models/tokenizer.py b/...e_generation/mindalle/models/tokenizer.py → ...e_generation/mindalle/models/tokenizer.py
diff --git a/...age_generation/mindalle/utils/__init__.py → ...age_generation/mindalle/utils/__init__.py b/...age_generation/mindalle/utils/__init__.py → ...age_generation/mindalle/utils/__init__.py
diff --git a/...image_generation/mindalle/utils/config.py → ...image_generation/mindalle/utils/config.py b/...image_generation/mindalle/utils/config.py → ...image_generation/mindalle/utils/config.py
diff --git a/...age_generation/mindalle/utils/sampling.py → ...age_generation/mindalle/utils/sampling.py b/...age_generation/mindalle/utils/sampling.py → ...age_generation/mindalle/utils/sampling.py
diff --git a/.../image_generation/mindalle/utils/utils.py → .../image_generation/mindalle/utils/utils.py b/.../image_generation/mindalle/utils/utils.py → .../image_generation/mindalle/utils/utils.py
diff --git a/...ients/image_generation/mindalle_client.py → ...ients/image_generation/mindalle_client.py b/...ients/image_generation/mindalle_client.py → ...ients/image_generation/mindalle_client.py
@@ -14,7 +14,7 @@
     TokenizationRequest,
     TokenizationRequestResult,
 )
-from helm.proxy.clients.client import Client, CachingClient
+from helm.clients.client import Client, CachingClient
 from .image_generation_client_utils import get_single_image_multimedia_object
 
 try:
@@ -36,7 +36,7 @@ def __init__(self, cache_config: CacheConfig, file_cache: FileCache):
 
     def _get_model(self):
         try:
-            from helm.proxy.clients.image_generation.mindalle.models import Dalle
+            from helm.clients.image_generation.mindalle.models import Dalle
         except ModuleNotFoundError as e:
             handle_module_not_found_error(e, ["heim"])
 

diff --git a/...s/image_generation/nudity_check_client.py → ...s/image_generation/nudity_check_client.py b/...s/image_generation/nudity_check_client.py → ...s/image_generation/nudity_check_client.py
diff --git a/...ation/together_image_generation_client.py → ...ation/together_image_generation_client.py b/...ation/together_image_generation_client.py → ...ation/together_image_generation_client.py
@@ -12,7 +12,7 @@
     DecodeRequestResult,
 )
 
-from helm.proxy.clients.client import CachingClient, Client
+from helm.clients.client import CachingClient, Client
 from .image_generation_client_utils import get_single_image_multimedia_object
 
 

diff --git a/src/helm/proxy/clients/lit_gpt_client.py → src/helm/clients/lit_gpt_client.py b/src/helm/proxy/clients/lit_gpt_client.py → src/helm/clients/lit_gpt_client.py
diff --git a/src/helm/proxy/clients/lit_gpt_generate.py → src/helm/clients/lit_gpt_generate.py b/src/helm/proxy/clients/lit_gpt_generate.py → src/helm/clients/lit_gpt_generate.py
diff --git a/src/helm/proxy/clients/megatron_client.py → src/helm/clients/megatron_client.py b/src/helm/proxy/clients/megatron_client.py → src/helm/clients/megatron_client.py
@@ -13,7 +13,7 @@
     Token,
 )
 from helm.common.tokenization_request import TokenizationRequest
-from helm.proxy.clients.client import CachingClient, truncate_sequence
+from helm.clients.client import CachingClient, truncate_sequence
 from helm.tokenizers.tokenizer import Tokenizer
 
 

diff --git a/src/helm/proxy/clients/mistral_client.py → src/helm/clients/mistral_client.py b/src/helm/proxy/clients/mistral_client.py → src/helm/clients/mistral_client.py
diff --git a/...lm/proxy/clients/moderation_api_client.py → src/helm/clients/moderation_api_client.py b/...lm/proxy/clients/moderation_api_client.py → src/helm/clients/moderation_api_client.py
diff --git a/src/helm/proxy/clients/open_lm_client.py → src/helm/clients/open_lm_client.py b/src/helm/proxy/clients/open_lm_client.py → src/helm/clients/open_lm_client.py
@@ -5,7 +5,7 @@
 from helm.common.cache import CacheConfig
 
 from helm.common.optional_dependencies import OptionalDependencyNotInstalled
-from helm.proxy.clients.huggingface_client import HuggingFaceClient
+from helm.clients.huggingface_client import HuggingFaceClient
 
 
 _register_open_lm_lock = Lock()

diff --git a/src/helm/proxy/clients/openai_client.py → src/helm/clients/openai_client.py b/src/helm/proxy/clients/openai_client.py → src/helm/clients/openai_client.py
diff --git a/src/helm/proxy/clients/palmyra_client.py → src/helm/clients/palmyra_client.py b/src/helm/proxy/clients/palmyra_client.py → src/helm/clients/palmyra_client.py
diff --git a/...m/proxy/clients/perspective_api_client.py → src/helm/clients/perspective_api_client.py b/...m/proxy/clients/perspective_api_client.py → src/helm/clients/perspective_api_client.py
@@ -8,7 +8,7 @@
 from googleapiclient.errors import BatchError, HttpError
 from googleapiclient.http import BatchHttpRequest
 from httplib2 import HttpLib2Error
-from helm.proxy.clients.toxicity_classifier_client import ToxicityClassifierClient
+from helm.clients.toxicity_classifier_client import ToxicityClassifierClient
 from helm.proxy.retry import NonRetriableException
 
 from helm.common.cache import Cache, CacheConfig

diff --git a/src/helm/proxy/clients/simple_client.py → src/helm/clients/simple_client.py b/src/helm/proxy/clients/simple_client.py → src/helm/clients/simple_client.py
diff --git a/src/helm/proxy/clients/test_auto_client.py → src/helm/clients/test_auto_client.py b/src/helm/proxy/clients/test_auto_client.py → src/helm/clients/test_auto_client.py
@@ -7,7 +7,7 @@
 
 from helm.common.request import Request, RequestResult
 from helm.common.general import get_credentials
-from helm.proxy.clients.auto_client import AutoClient
+from helm.clients.auto_client import AutoClient
 
 
 @pytest.mark.models

diff --git a/src/helm/proxy/clients/test_client.py → src/helm/clients/test_client.py b/src/helm/proxy/clients/test_client.py → src/helm/clients/test_client.py
diff --git a/.../proxy/clients/test_huggingface_client.py → src/helm/clients/test_huggingface_client.py b/.../proxy/clients/test_huggingface_client.py → src/helm/clients/test_huggingface_client.py
diff --git a/...elm/proxy/clients/test_together_client.py → src/helm/clients/test_together_client.py b/...elm/proxy/clients/test_together_client.py → src/helm/clients/test_together_client.py
diff --git a/src/helm/proxy/clients/together_client.py → src/helm/clients/together_client.py b/src/helm/proxy/clients/together_client.py → src/helm/clients/together_client.py
diff --git a/...oxy/clients/toxicity_classifier_client.py → ...elm/clients/toxicity_classifier_client.py b/...oxy/clients/toxicity_classifier_client.py → ...elm/clients/toxicity_classifier_client.py
diff --git a/src/helm/proxy/clients/vertexai_client.py → src/helm/clients/vertexai_client.py b/src/helm/proxy/clients/vertexai_client.py → src/helm/clients/vertexai_client.py
diff --git a/...proxy/clients/vision_language/__init__.py → src/helm/clients/vision_language/__init__.py b/...proxy/clients/vision_language/__init__.py → src/helm/clients/vision_language/__init__.py