diff --git a/nodejs/scripts/update-protocol-version.ts b/nodejs/scripts/update-protocol-version.ts index 46f6189e8..a18a560c7 100644 --- a/nodejs/scripts/update-protocol-version.ts +++ b/nodejs/scripts/update-protocol-version.ts @@ -8,7 +8,7 @@ * Reads from sdk-protocol-version.json and generates: * - nodejs/src/sdkProtocolVersion.ts * - go/sdk_protocol_version.go - * - python/copilot/sdk_protocol_version.py + * - python/copilot/_sdk_protocol_version.py * - dotnet/src/SdkProtocolVersion.cs * * Run this script whenever the protocol version changes. @@ -89,8 +89,8 @@ def get_sdk_protocol_version() -> int: """ return SDK_PROTOCOL_VERSION `; -fs.writeFileSync(path.join(rootDir, "python", "copilot", "sdk_protocol_version.py"), pythonCode); -console.log(" ✓ python/copilot/sdk_protocol_version.py"); +fs.writeFileSync(path.join(rootDir, "python", "copilot", "_sdk_protocol_version.py"), pythonCode); +console.log(" ✓ python/copilot/_sdk_protocol_version.py"); // Generate C# const csharpCode = `// Code generated by update-protocol-version.ts. DO NOT EDIT. diff --git a/python/copilot/jsonrpc.py b/python/copilot/_jsonrpc.py similarity index 100% rename from python/copilot/jsonrpc.py rename to python/copilot/_jsonrpc.py diff --git a/python/copilot/sdk_protocol_version.py b/python/copilot/_sdk_protocol_version.py similarity index 100% rename from python/copilot/sdk_protocol_version.py rename to python/copilot/_sdk_protocol_version.py diff --git a/python/copilot/telemetry.py b/python/copilot/_telemetry.py similarity index 100% rename from python/copilot/telemetry.py rename to python/copilot/_telemetry.py diff --git a/python/copilot/client.py b/python/copilot/client.py index 0d8074fe0..81c1459f2 100644 --- a/python/copilot/client.py +++ b/python/copilot/client.py @@ -25,12 +25,12 @@ from pathlib import Path from typing import Any, cast, overload +from ._jsonrpc import JsonRpcClient, ProcessExitedError +from ._sdk_protocol_version import get_sdk_protocol_version +from ._telemetry import get_trace_context, trace_context from .generated.rpc import ServerRpc from .generated.session_events import PermissionRequest, session_event_from_dict -from .jsonrpc import JsonRpcClient, ProcessExitedError -from .sdk_protocol_version import get_sdk_protocol_version from .session import CopilotSession -from .telemetry import get_trace_context, trace_context from .types import ( ConnectionState, CustomAgentConfig, diff --git a/python/copilot/generated/rpc.py b/python/copilot/generated/rpc.py index 564ccf64e..da6748d79 100644 --- a/python/copilot/generated/rpc.py +++ b/python/copilot/generated/rpc.py @@ -6,7 +6,7 @@ from typing import TYPE_CHECKING if TYPE_CHECKING: - from ..jsonrpc import JsonRpcClient + from .._jsonrpc import JsonRpcClient from dataclasses import dataclass diff --git a/python/copilot/session.py b/python/copilot/session.py index e4a17f2f9..90d156c4c 100644 --- a/python/copilot/session.py +++ b/python/copilot/session.py @@ -11,6 +11,8 @@ from collections.abc import Callable from typing import Any, Literal, cast +from ._jsonrpc import JsonRpcError, ProcessExitedError +from ._telemetry import get_trace_context, trace_context from .generated.rpc import ( Kind, Level, @@ -23,8 +25,6 @@ SessionToolsHandlePendingToolCallParams, ) from .generated.session_events import SessionEvent, SessionEventType, session_event_from_dict -from .jsonrpc import JsonRpcError, ProcessExitedError -from .telemetry import get_trace_context, trace_context from .types import ( Attachment, PermissionRequest, diff --git a/python/test_jsonrpc.py b/python/test_jsonrpc.py index 7c3c8dab2..c0ab2c6f4 100644 --- a/python/test_jsonrpc.py +++ b/python/test_jsonrpc.py @@ -13,7 +13,7 @@ import pytest -from copilot.jsonrpc import JsonRpcClient +from copilot._jsonrpc import JsonRpcClient class MockProcess: diff --git a/python/test_telemetry.py b/python/test_telemetry.py index 2b4649011..aec38f816 100644 --- a/python/test_telemetry.py +++ b/python/test_telemetry.py @@ -4,7 +4,7 @@ from unittest.mock import patch -from copilot.telemetry import get_trace_context, trace_context +from copilot._telemetry import get_trace_context, trace_context from copilot.types import SubprocessConfig, TelemetryConfig diff --git a/scripts/codegen/python.ts b/scripts/codegen/python.ts index 3dfa52535..cbbc3df38 100644 --- a/scripts/codegen/python.ts +++ b/scripts/codegen/python.ts @@ -10,8 +10,9 @@ import fs from "fs/promises"; import type { JSONSchema7 } from "json-schema"; import { FetchingJSONSchemaStore, InputData, JSONSchemaInput, quicktype } from "quicktype-core"; import { - getSessionEventsSchemaPath, getApiSchemaPath, + getSessionEventsSchemaPath, + isRpcMethod, postProcessSchema, writeGeneratedFile, isRpcMethod, @@ -242,7 +243,7 @@ Generated from: api.schema.json from typing import TYPE_CHECKING if TYPE_CHECKING: - from ..jsonrpc import JsonRpcClient + from .._jsonrpc import JsonRpcClient `); lines.push(typesCode);