dc-python-sdk 1.5.22__tar.gz → 1.5.23__tar.gz

{dc_python_sdk-1.5.22/src/dc_python_sdk.egg-info → dc_python_sdk-1.5.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dc-python-sdk
-Version: 1.5.22
+Version: 1.5.23
 Summary: Data Connector Python SDK
 Home-page: https://github.com/data-connector/dc-python-sdk
 Author: DataConnector

{dc_python_sdk-1.5.22 → dc_python_sdk-1.5.23}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "dc-python-sdk"
-version = "1.5.22"
+version = "1.5.23"
 description = "Data Connector Python SDK"
 readme = "README.md"
 requires-python = ">=3.6"

{dc_python_sdk-1.5.22 → dc_python_sdk-1.5.23}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = dc-python-sdk
-version = 1.5.22
+version = 1.5.23
 author = DataConnector
 author_email = josh@dataconnector.com
 description = A small example package

{dc_python_sdk-1.5.22 → dc_python_sdk-1.5.23/src/dc_python_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dc-python-sdk
-Version: 1.5.22
+Version: 1.5.23
 Summary: Data Connector Python SDK
 Home-page: https://github.com/data-connector/dc-python-sdk
 Author: DataConnector

{dc_python_sdk-1.5.22 → dc_python_sdk-1.5.23}/src/dc_sdk/src/ai_http.py

@@ -18,6 +18,8 @@ logging.basicConfig(level=logging.INFO)
 
 app = FastAPI()
 
+_DEFAULT_PROCESS_TTL_SECONDS = 600.0
+
 client = None
 workspace = os.getenv("WORKSPACE", "/workspace")
 port_for_connector = 5000
@@ -65,21 +67,6 @@ class RunRequest(BaseModel):
     test_object_ids: Optional[List[str]] = None
 
 
-# -----------------------------
-# UTIL
-# -----------------------------
-def get_free_port():
-    import socket
-    s = socket.socket()
-    s.bind(('', 0))
-    port = s.getsockname()[1]
-    s.close()
-    return port
-
-
-_DEFAULT_PROCESS_TTL_SECONDS = 600.0
-
-
 def _parse_process_ttl_seconds() -> float:
     """
     Wall-clock lifetime for the whole ai-http process from start_ai_http() entry.
@@ -104,7 +91,6 @@ def _parse_process_ttl_seconds() -> float:
         return 0.0
     return v
 
-
 def start_connector():
     global workspace
     global port_for_connector
@@ -130,7 +116,6 @@ def start_connector():
     proc.terminate()
     raise Exception("Failed to start connector")
 
-
 def stop_connector(runtime):
     try:
         runtime["process"].terminate()
@@ -139,7 +124,6 @@ def stop_connector(runtime):
     except Exception:
         logger.debug("Error stopping connector subprocess", exc_info=True)
 
-
 def invoke(port, method, session_id=None, credentials=None, params=None):
     payload = {
         "method": method,
@@ -156,13 +140,11 @@ def invoke(port, method, session_id=None, credentials=None, params=None):
         )
     return res.json()
 
-
 def read_connector():
     global workspace
     with open(f"{workspace}/src/connector.py", "r") as f:
         return f.read()
 
-
 def _resolved_connector_context(opt: Optional[ConnectorContext]) -> ConnectorContext:
     from dc_sdk.src.ai import CONNECTOR_CONTEXT as defaults
 
@@ -179,7 +161,6 @@ def _resolved_connector_context(opt: Optional[ConnectorContext]) -> ConnectorCon
                 merged[key] = value
     return ConnectorContext(**merged)
 
-
 def _chat_messages_to_openai(messages: Optional[List[ChatMessage]]) -> List[Dict[str, str]]:
     if not messages:
         return []
@@ -190,7 +171,6 @@ def _chat_messages_to_openai(messages: Optional[List[ChatMessage]]) -> List[Dict
         out.append({"role": m.role, "content": m.content})
     return out
 
-
 def _coerce_prior_dicts(prior: Optional[List[Dict[str, str]]]) -> List[Dict[str, str]]:
     out: List[Dict[str, str]] = []
     for m in prior or []:
@@ -200,19 +180,16 @@ def _coerce_prior_dicts(prior: Optional[List[Dict[str, str]]]) -> List[Dict[str,
             out.append({"role": role, "content": content})
     return out
 
-
 def write_connector(code):
     global workspace
     with open(f"{workspace}/src/connector.py", "w") as f:
         f.write(code)
 
-
 def _canon_object_id(value: Any) -> str:
     if value is None:
         return ""
     return str(value).strip()
 
-
 def _object_ids_from_get_objects_results(objects: List[Any]) -> List[str]:
     seen = set()
     out: List[str] = []
@@ -225,10 +202,6 @@ def _object_ids_from_get_objects_results(objects: List[Any]) -> List[str]:
             out.append(oid)
     return out
 
-
-# -----------------------------
-# TEST FLOW
-# -----------------------------
 def run_test(
     credentials,
     *,
@@ -413,7 +386,6 @@ def _validate_static_requires_object_ids(
             ),
         )
 
-
 def _build_full_fix_prompt(
     code: str,
     error_message: str,
@@ -738,13 +710,58 @@ def clone_repo():
     subprocess.run(["git", "-C", workspace, "checkout", branch], check=True)
     subprocess.run(["git", "-C", workspace, "pull"], check=True)
 
-def start_ai_http(connector_port=5000):
+def run_code_server(port):
+    global port_for_connector
+    logger.info("code-server path: %s", shutil.which("code-server"))
+
+    # ✅ Ensure config dir exists
+    os.makedirs("/root/.config/code-server", exist_ok=True)
+
+    # ✅ Write code-server config
+    with open("/root/.config/code-server/config.yaml", "w") as f:
+        f.write(
+            f"bind-addr: 0.0.0.0:{port}\n"
+            "auth: none\n"
+        )
+
+    with open("/root/.config/code-server/config.yaml", "r") as f:
+        logger.info("code-server config:\n%s", f.read())
+
+    # ✅ Ensure workspace + vscode dir exists
+    os.makedirs(workspace, exist_ok=True)
+    os.makedirs(f"{workspace}/.vscode", exist_ok=True)
+
+    # ✅ Write VS Code settings
+    with open(f"{workspace}/.vscode/settings.json", "w") as f:
+        f.write("""{
+  "chat.disableAIFeatures": true,
+  "workbench.colorTheme": "Default Dark+",
+  "outline.showFiles": false,
+  "timeline.enabled": false,
+  "python.defaultInterpreterPath": "/usr/local/bin/python"
+}""")
+
+    # ✅ Start code-server (NO extension install here)
+    code_server_proc = subprocess.Popen([
+        "code-server",
+        workspace,
+        "--config", "/root/.config/code-server/config.yaml"
+    ])
+
+    time.sleep(3)
+
+    if code_server_proc.poll() is not None:
+        raise Exception("code-server failed to start")
+
+    return code_server_proc
+
+def start_ai_http(connector_port=5000, start_code_server=True):
     global client
     global workspace
-    global port_for_connector
     global process_ttl_seconds
     global process_ttl_deadline_unix
     global _process_ttl_timer
+    global port_for_connector
 
     port_for_connector = connector_port
 
@@ -787,50 +804,12 @@ def start_ai_http(connector_port=5000):
 
     api_key = os.getenv("OPENAI_API_KEY")
     ai_port = int(os.getenv("AI_PORT", 5050))
-    code_port = int(os.getenv("CODE_SERVER_PORT", 5002))
+    connector_server_port = int(os.getenv("CONNECTOR_SERVER_PORT", 5001))
 
     clone_repo()
 
-    logger.info("code-server path: %s", shutil.which("code-server"))
-
-    # ✅ Ensure config dir exists
-    os.makedirs("/root/.config/code-server", exist_ok=True)
-
-    # ✅ Write code-server config
-    with open("/root/.config/code-server/config.yaml", "w") as f:
-        f.write(
-            f"bind-addr: 0.0.0.0:{code_port}\n"
-            "auth: none\n"
-        )
-
-    with open("/root/.config/code-server/config.yaml", "r") as f:
-        logger.info("code-server config:\n%s", f.read())
-
-    # ✅ Ensure workspace + vscode dir exists
-    os.makedirs(workspace, exist_ok=True)
-    os.makedirs(f"{workspace}/.vscode", exist_ok=True)
-
-    # ✅ Write VS Code settings
-    with open(f"{workspace}/.vscode/settings.json", "w") as f:
-        f.write("""{
-  "chat.disableAIFeatures": true,
-  "workbench.colorTheme": "Default Dark+",
-  "outline.showFiles": false,
-  "timeline.enabled": false,
-  "python.defaultInterpreterPath": "/usr/local/bin/python"
-}""")
-
-    # ✅ Start code-server (NO extension install here)
-    code_server_proc = subprocess.Popen([
-        "code-server",
-        workspace,
-        "--config", "/root/.config/code-server/config.yaml"
-    ])
-
-    time.sleep(3)
-
-    if code_server_proc.poll() is not None:
-        raise Exception("code-server failed to start")
+    if start_code_server:
+        code_server_proc = run_code_server(connector_server_port)
 
     def shutdown():
         global _process_ttl_timer