finally working

Author: joroscoSF

src/datacustomcode/__init__.py

@@ -17,7 +17,9 @@
 from datacustomcode.credentials import AuthType, Credentials
 from datacustomcode.io.reader.query_api import QueryAPIDataCloudReader
 from datacustomcode.io.writer.print import PrintDataCloudWriter
-from datacustomcode.proxy.client.client import LocalProxyClientProvider
+from datacustomcode.proxy.client.LocalProxyClientProvider import (
+    LocalProxyClientProvider,
+)
 
 __all__ = [
     "AuthType",

src/datacustomcode/client.py

@@ -120,9 +120,7 @@ def __new__(
         spark_provider: Optional["BaseSparkSessionProvider"] = None,
         code_type: str = "script",
     ) -> Client:
-        print(f"Chuy client new client: {code_type}")
         if "function" in code_type:
-            print("Chuy111 client new function client")
             return cls._new_function_client()
 
         if cls._instance is None:
@@ -180,11 +178,19 @@ def __new__(
 
     @classmethod
     def _new_function_client(cls) -> Client:
-        print(f"Chuy config: {config}")
-
-        importlib.import_module(
-            "datacustomcoderemote.proxy.client.client.ProxyClientProvider"
-        )
+        for dependency in config.dependencies:
+            try:
+                importlib.import_module(dependency)
+            except ModuleNotFoundError as exc:
+                try:
+                    if "." in dependency:
+                        module_name, object_name = dependency.rsplit(".", 1)
+                        module = importlib.import_module(module_name)
+                        getattr(module, object_name)
+                    else:
+                        raise exc
+                except AttributeError as inner_exc:
+                    raise inner_exc from exc
 
         cls._instance = super().__new__(cls)
         cls._instance._proxy = (

src/datacustomcode/config.py

@@ -133,6 +133,13 @@ class ClientConfig(BaseModel):
     spark_provider_config: Union[
         SparkProviderConfig[BaseSparkSessionProvider], None
     ] = None
+    dependencies: list[str] = Field(
+        default_factory=list,
+        description="""
+        Extra modules to import before running the entrypoint
+         (merged with --dependencies from CLI).
+        """,
+    )
 
     def update(self, other: ClientConfig) -> ClientConfig:
         """Merge this ClientConfig with another, respecting force flags.
@@ -161,6 +168,7 @@ def merge(
         self.spark_provider_config = merge(
             self.spark_provider_config, other.spark_provider_config
         )
+        self.dependencies = list(dict.fromkeys(self.dependencies + other.dependencies))
         return self
 
     def load(self, config_path: str) -> ClientConfig:

src/datacustomcode/proxy/client/LocalProxyClientProvider.py

@@ -0,0 +1,30 @@
+# Copyright (c) 2025, Salesforce, Inc.
+# SPDX-License-Identifier: Apache-2
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+from __future__ import annotations
+
+from datacustomcode.proxy.client.base import BaseProxyClient
+
+
+class LocalProxyClientProvider(BaseProxyClient):
+    """Default proxy client provider."""
+
+    CONFIG_NAME = "LocalProxyClientProvider"
+
+    def __init__(self, credentials_profile: str = "default", **kwargs: object) -> None:
+        super().__init__()
+        self.credentials_profile = credentials_profile
+
+    def call_llm_gateway(self, llmModelId: str, prompt: str, maxTokens: int) -> str:
+        return f"Hello, thanks for using {llmModelId}. So many tokens: {maxTokens}"

src/datacustomcode/run.py

@@ -52,6 +52,13 @@ def run_entrypoint(
     """
     add_py_folder(entrypoint)
 
+    # Load config file (so we can merge config.dependencies with CLI deps)
+    if config_file:
+        config.load(config_file)
+
+    # Merge dependencies from config and CLI (config first, then CLI, deduped)
+    merged_dependencies = list(dict.fromkeys(config.dependencies + list(dependencies)))
+
     # Read dataspace from config.json (required)
     entrypoint_dir = os.path.dirname(entrypoint)
     config_json_path = os.path.join(entrypoint_dir, "config.json")
@@ -81,18 +88,14 @@ def run_entrypoint(
                 f"Please ensure config.json contains a 'dataspace' field."
             )
 
-        # Load config file first
-        if config_file:
-            config.load(config_file)
-
         # Add dataspace to reader and writer config options
         _set_config_option(config.reader_config, "dataspace", dataspace)
         _set_config_option(config.writer_config, "dataspace", dataspace)
 
     if profile != "default":
         _set_config_option(config.reader_config, "credentials_profile", profile)
         _set_config_option(config.writer_config, "credentials_profile", profile)
-    for dependency in dependencies:
+    for dependency in merged_dependencies:
         try:
             importlib.import_module(dependency)
         except ModuleNotFoundError as exc: