scale-gp-beta 0.1.0a20__tar.gz → 0.1.0a21__tar.gz

scale_gp_beta-0.1.0a21/.release-please-manifest.json

@@ -0,0 +1,3 @@
+{
+  ".": "0.1.0-alpha.21"
+}

{scale_gp_beta-0.1.0a20 → scale_gp_beta-0.1.0a21}/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 0.1.0-alpha.21 (2025-06-13)
+
+Full Changelog: [v0.1.0-alpha.20...v0.1.0-alpha.21](https://github.com/scaleapi/sgp-python-beta/compare/v0.1.0-alpha.20...v0.1.0-alpha.21)
+
+### Features
+
+* Group id support ([#110](https://github.com/scaleapi/sgp-python-beta/issues/110)) ([d934d91](https://github.com/scaleapi/sgp-python-beta/commit/d934d9136db1210e934e2c34b754200678ea60ca))
+
+
+### Bug Fixes
+
+* **client:** correctly parse binary response | stream ([f802181](https://github.com/scaleapi/sgp-python-beta/commit/f80218120e7f6780461ee0eac836139241532421))
+
 ## 0.1.0-alpha.20 (2025-06-12)
 
 Full Changelog: [v0.1.0-alpha.19...v0.1.0-alpha.20](https://github.com/scaleapi/sgp-python-beta/compare/v0.1.0-alpha.19...v0.1.0-alpha.20)

{scale_gp_beta-0.1.0a20 → scale_gp_beta-0.1.0a21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: scale-gp-beta
-Version: 0.1.0a20
+Version: 0.1.0a21
 Summary: The official Python library for the Scale GP API
 Project-URL: Homepage, https://github.com/scaleapi/sgp-python-beta
 Project-URL: Repository, https://github.com/scaleapi/sgp-python-beta

{scale_gp_beta-0.1.0a20 → scale_gp_beta-0.1.0a21}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "scale-gp-beta"
-version = "0.1.0-alpha.20"
+version = "0.1.0-alpha.21"
 description = "The official Python library for the Scale GP API"
 dynamic = ["readme"]
 license = "Apache-2.0"

{scale_gp_beta-0.1.0a20 → scale_gp_beta-0.1.0a21}/src/scale_gp_beta/_base_client.py

@@ -1071,7 +1071,14 @@ class SyncAPIClient(BaseClient[httpx.Client, Stream[Any]]):
     ) -> ResponseT:
         origin = get_origin(cast_to) or cast_to
 
-        if inspect.isclass(origin) and issubclass(origin, BaseAPIResponse):
+        if (
+            inspect.isclass(origin)
+            and issubclass(origin, BaseAPIResponse)
+            # we only want to actually return the custom BaseAPIResponse class if we're
+            # returning the raw response, or if we're not streaming SSE, as if we're streaming
+            # SSE then `cast_to` doesn't actively reflect the type we need to parse into
+            and (not stream or bool(response.request.headers.get(RAW_RESPONSE_HEADER)))
+        ):
             if not issubclass(origin, APIResponse):
                 raise TypeError(f"API Response types must subclass {APIResponse}; Received {origin}")
 
@@ -1574,7 +1581,14 @@ class AsyncAPIClient(BaseClient[httpx.AsyncClient, AsyncStream[Any]]):
     ) -> ResponseT:
         origin = get_origin(cast_to) or cast_to
 
-        if inspect.isclass(origin) and issubclass(origin, BaseAPIResponse):
+        if (
+            inspect.isclass(origin)
+            and issubclass(origin, BaseAPIResponse)
+            # we only want to actually return the custom BaseAPIResponse class if we're
+            # returning the raw response, or if we're not streaming SSE, as if we're streaming
+            # SSE then `cast_to` doesn't actively reflect the type we need to parse into
+            and (not stream or bool(response.request.headers.get(RAW_RESPONSE_HEADER)))
+        ):
             if not issubclass(origin, AsyncAPIResponse):
                 raise TypeError(f"API Response types must subclass {AsyncAPIResponse}; Received {origin}")
 

{scale_gp_beta-0.1.0a20 → scale_gp_beta-0.1.0a21}/src/scale_gp_beta/_version.py

@@ -1,4 +1,4 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 __title__ = "scale_gp_beta"
-__version__ = "0.1.0-alpha.20"  # x-release-please-version
+__version__ = "0.1.0-alpha.21"  # x-release-please-version

{scale_gp_beta-0.1.0a20 → scale_gp_beta-0.1.0a21}/src/scale_gp_beta/lib/tracing/span.py

@@ -53,6 +53,7 @@ class BaseSpan:
         queue_manager: Optional[TraceQueueManager] = None,
         span_id: Optional[str] = None,
         parent_span_id: Optional[str] = None,
+        group_id: Optional[str] = None,
         input: Optional[SpanInputParam] = None,
         output: Optional[SpanOutputParam] = None,
         metadata: Optional[SpanMetadataParam] = None,
@@ -60,6 +61,7 @@ class BaseSpan:
     ):
         self.name = name
         self.trace_id = trace_id or "no_trace_id"
+        self.group_id = group_id
         self.span_id: str = span_id or generate_span_id()
         self.parent_span_id = parent_span_id
         self.start_time: Optional[str] = None
@@ -124,6 +126,9 @@ class BaseSpan:
         if self.parent_span_id is not None:
             request_data["parent_id"] = self.parent_span_id
 
+        if self.group_id is not None:
+            request_data["group_id"] = self.group_id
+
         return request_data
 
     @override
@@ -134,6 +139,7 @@ class BaseSpan:
             f"span_id='{self.span_id}', "
             f"trace_id='{self.trace_id}', "
             f"parent_span_id='{self.parent_span_id}', "
+            f"group_id='{self.group_id}', "
             f"start_time='{self.start_time}', "
             f"end_time='{self.end_time}', "
             f"input='{self.input}', "
@@ -189,12 +195,13 @@ class Span(BaseSpan):
         queue_manager: TraceQueueManager,
         span_id: Optional[str] = None,
         parent_span_id: Optional[str] = None,
+        group_id: Optional[str] = None,
         input: Optional[SpanInputParam] = None,
         output: Optional[SpanOutputParam] = None,
         metadata: Optional[SpanMetadataParam] = None,
         span_type: SpanTypeLiterals = "STANDALONE",
     ):
-        super().__init__(name, trace_id, queue_manager, span_id, parent_span_id, input, output, metadata, span_type)
+        super().__init__(name, trace_id, queue_manager, span_id, parent_span_id, group_id, input, output, metadata, span_type)
         self._queue_manager: TraceQueueManager = queue_manager
         self.trace_id: str = trace_id
 
@@ -206,7 +213,6 @@ class Span(BaseSpan):
         The background worker batches and sends asynchronously.
         :param blocking:
         """
-        # TODO: implement flush() for trace
         if blocking:
             self._queue_manager.export_now(self)
         else:

{scale_gp_beta-0.1.0a20 → scale_gp_beta-0.1.0a21}/src/scale_gp_beta/lib/tracing/trace.py

@@ -27,6 +27,12 @@ class BaseTrace:
     def end(self) -> None:
         pass
 
+    def flush(self, blocking: bool = True) -> None:
+        pass
+
+    def group_id(self) -> Optional[str]:
+        return None
+
     def __enter__(self) -> "BaseTrace":
         self.start()
         return self
@@ -55,6 +61,7 @@ class NoOpTrace(BaseTrace):
             queue_manager: Optional[TraceQueueManager] = None,
             trace_id: Optional[str] = None,
             span_id: Optional[str] = None,
+            group_id: Optional[str] = None,
             span_type: SpanTypeLiterals = "TRACER",
             input: Optional[SpanInputParam] = None,
             output: Optional[SpanOutputParam] = None,
@@ -66,6 +73,7 @@ class NoOpTrace(BaseTrace):
             name=name,
             span_id=span_id,
             trace_id=self.trace_id,
+            group_id=group_id,
             queue_manager=queue_manager,
             metadata=metadata,
             span_type=span_type,
@@ -90,6 +98,10 @@ class NoOpTrace(BaseTrace):
     def end(self) -> None:
         self.root_span.end()
 
+    @override
+    def group_id(self) -> Optional[str]:
+        return self.root_span.group_id
+
 
 class Trace(BaseTrace):
     def __init__(
@@ -98,6 +110,7 @@ class Trace(BaseTrace):
             queue_manager: TraceQueueManager,
             trace_id: Optional[str] = None,
             span_id: Optional[str] = None,
+            group_id: Optional[str] = None,
             span_type: SpanTypeLiterals = "TRACER",
             input: Optional[SpanInputParam] = None,
             output: Optional[SpanOutputParam] = None,
@@ -110,6 +123,7 @@ class Trace(BaseTrace):
             name=name,
             span_id=span_id,
             trace_id=self.trace_id,
+            group_id=group_id,
             queue_manager=queue_manager,
             metadata=metadata,
             span_type=span_type,
@@ -145,6 +159,14 @@ class Trace(BaseTrace):
 
         self.root_span.end()
 
+    @override
+    def flush(self, blocking: bool = True) -> None:
+        self.root_span.flush(blocking=blocking)
+
+    @override
+    def group_id(self) -> Optional[str]:
+        return self.root_span.group_id
+
     @override
     def __repr__(self) -> str:
         return (

{scale_gp_beta-0.1.0a20 → scale_gp_beta-0.1.0a21}/src/scale_gp_beta/lib/tracing/tracing.py

@@ -57,6 +57,7 @@ def create_trace(
         metadata: Optional[SpanMetadataParam] = None,
         span_id: Optional[str] = None,
         trace_id: Optional[str] = None,
+        group_id: Optional[str] = None,
 ) -> BaseTrace:
     """Creates a new trace and root span instance.
 
@@ -81,6 +82,7 @@ def create_trace(
         trace_id (Optional[str]): An optional, user-defined ID for the trace.
                                   If None, a unique trace ID will be generated.
                                   Max length is 38 characters.
+        group_id (Optional[str]): An optional, id to group traces.
 
     Returns:
         BaseTrace: A `Trace` instance if tracing is enabled, or a `NoOpTrace`
@@ -96,6 +98,7 @@ def create_trace(
             name=name,
             trace_id=trace_id,
             span_id=span_id,
+            group_id=group_id,
             span_type=span_type,
             input=impl_input,
             output=impl_output,
@@ -111,6 +114,7 @@ def create_trace(
         name=name,
         trace_id=trace_id,
         span_id=span_id,
+        group_id=group_id,
         queue_manager=queue_manager,
         span_type=span_type,
         input=impl_input,
@@ -131,6 +135,7 @@ def create_span(
     span_id: Optional[str] = None,
     parent_id: Optional[str] = None,
     trace_id: Optional[str] = None,
+    group_id: Optional[str] = None,
 ) -> BaseSpan:
     """Creates a new span instance.
 
@@ -164,7 +169,8 @@ def create_span(
         parent_id (Optional[str], optional): A `Span` id. Used for explicit control.
         Defaults to span id fetched from the active scope.
         trace_id (Optional[str], optional): A `Trace` id. Used for explicit control.
-        Default to trace id fetched from the active scope.
+            Default to trace id fetched from the active scope.
+        group_id (Optional[str]): An optional, id to group traces.
 
     Returns:
         BaseSpan: A `Span` instance if tracing is enabled and a valid trace context
@@ -176,12 +182,15 @@ def create_span(
 
     scoped_trace = current_trace()
     scoped_trace_id = scoped_trace.trace_id if scoped_trace else None
+    scoped_group_id = scoped_trace.group_id() if scoped_trace else None
     scoped_span = current_span()
     scoped_span_id = scoped_span.span_id if scoped_span else None
 
     parent_span_id: Optional[str] = parent_id or scoped_span_id
     # TODO: preference should be trace_id -> trace_id from parent span if parent_id present -> scoped_trace_id
+    # group_id -> group_id from trace if trace_id specified -> group_id from span if span_id -> scoped_group_id
     impl_trace_id: Optional[str] = trace_id or scoped_trace_id
+    impl_group_id: Optional[str] = group_id or scoped_group_id
 
     # TODO: do a check to ensure trace_id of parent_span matches trace_id (when trace_id is specified)
 
@@ -190,6 +199,7 @@ def create_span(
         span_id=span_id,
         parent_span_id=parent_span_id,
         trace_id=impl_trace_id,
+        group_id=impl_group_id,
         input=impl_input,
         output=impl_output,
         metadata=impl_metadata,
@@ -209,6 +219,7 @@ def create_span(
         span_id=span_id,
         parent_span_id=parent_span_id,
         trace_id=impl_trace_id,
+        group_id=impl_group_id,
         input=impl_input,
         output=impl_output,
         metadata=impl_metadata,

{scale_gp_beta-0.1.0a20 → scale_gp_beta-0.1.0a21}/tests/lib/test_trace_exporter.py

@@ -14,7 +14,7 @@ from scale_gp_beta.types.span_upsert_batch_params import Item as SpanCreateReque
 
 
 def create_test_span_request(id_str: str) -> SpanCreateRequest:
-    return SpanCreateRequest(name=id_str, id=id_str, trace_id= "trace-id", start_timestamp="start")
+    return SpanCreateRequest(name=id_str, id=id_str, trace_id= "trace-id", group_id="group-id", start_timestamp="start")
 
 
 @pytest.fixture

{scale_gp_beta-0.1.0a20 → scale_gp_beta-0.1.0a21}/tests/lib/test_tracing.py

@@ -19,6 +19,7 @@ def mock_queue_manager_instance() -> Mock:
 def mock_active_trace_instance() -> Mock:
     trace_mock = Mock(spec=Trace)
     trace_mock.trace_id = "active-trace-id"
+    trace_mock.group_id.return_value = "active-group-id"
     return trace_mock
 
 @pytest.fixture
@@ -66,6 +67,7 @@ class TestCreateTrace:
             name=trace_name_arg,
             trace_id=trace_id_arg,
             span_id=None,
+            group_id=None,
             span_type="TRACER",
             metadata={},
             input={},
@@ -100,6 +102,7 @@ class TestCreateTrace:
             name=trace_name_arg,
             trace_id=trace_id_arg,
             span_id=None,
+            group_id=None,
             queue_manager=mock_queue_manager_instance,
             span_type="TRACER",
             metadata={},
@@ -163,6 +166,7 @@ class TestCreateSpan:
             name=span_name,
             span_id=span_id_arg,
             parent_span_id=None,
+            group_id=None,
             trace_id=mock_parent_trace.trace_id,
             input={}, output={}, metadata={},
             span_type="STANDALONE"
@@ -183,9 +187,10 @@ class TestCreateSpan:
         mock_noop_span_instance = mock_noop_span_init.return_value
         span_name = "orphaned_span"
         span_id_arg = "custom-span-id-orphaned"
+        group_id_arg = "custom-group-id-orphaned"
 
         with caplog.at_level(logging.DEBUG):
-            span = create_span(name=span_name, span_id=span_id_arg)
+            span = create_span(name=span_name, span_id=span_id_arg, group_id=group_id_arg)
 
         assert span == mock_noop_span_instance
         mock_get_current_trace.assert_called_once_with()
@@ -193,6 +198,7 @@ class TestCreateSpan:
             name=span_name,
             span_id=span_id_arg,
             parent_span_id=None,
+            group_id=group_id_arg,
             trace_id=None,
             input={}, output={}, metadata={},
             span_type="STANDALONE"
@@ -220,6 +226,7 @@ class TestCreateSpan:
 
         mock_parent_trace = Mock(spec=Trace)
         mock_parent_trace.trace_id = "explicit-parent-trace-id"
+        mock_parent_trace.group_id = "explicit-parent-group-id"
         span_name = "span_with_trace_parent"
         span_id_arg = "custom-id-trace-parent"
         input_arg = {"input_key": "input_val"}
@@ -232,6 +239,7 @@ class TestCreateSpan:
                 name=span_name,
                 span_id=span_id_arg,
                 trace_id=mock_parent_trace.trace_id,
+                group_id=mock_parent_trace.group_id,
                 input=input_arg,
                 output=output_arg,
                 metadata=metadata_arg
@@ -243,6 +251,7 @@ class TestCreateSpan:
             name=span_name,
             span_id=span_id_arg,
             parent_span_id=mock_active_span_instance.span_id,
+            group_id=mock_parent_trace.group_id,
             trace_id=mock_parent_trace.trace_id,
             input=input_arg,
             output=output_arg,
@@ -268,11 +277,12 @@ class TestCreateSpan:
         mock_tqm_func.return_value = mock_queue_manager_instance
 
         mock_parent_s = Mock(spec=Span)
+        mock_parent_s.group_id = "explicit-parent-group-id"
         mock_parent_s.trace_id = "parent-span-trace-id"
         mock_parent_s.span_id = "parent-span-actual-id"
         span_name = "span_with_span_parent"
 
-        create_span(name=span_name, parent_id=mock_parent_s.span_id)
+        create_span(name=span_name, parent_id=mock_parent_s.span_id, group_id=mock_parent_s.group_id)
 
         # NOTE: this will grab the trace_id from current context and not mock_parent_s.trace_id
         mock_span_init.assert_called_once_with(
@@ -280,6 +290,7 @@ class TestCreateSpan:
             span_id=None,
             parent_span_id=mock_parent_s.span_id,
             trace_id=mock_parent_s.trace_id,
+            group_id=mock_parent_s.group_id,
             input={}, output={}, metadata={},
             queue_manager=mock_queue_manager_instance,
             span_type="STANDALONE"
@@ -310,6 +321,7 @@ class TestCreateSpan:
             name="span_uses_scope_trace",
             span_id=None,
             parent_span_id=None,
+            group_id=mock_active_trace_instance.group_id(),
             trace_id=mock_active_trace_instance.trace_id,
             input={}, output={}, metadata={},
             queue_manager=mock_queue_manager_instance,
@@ -343,6 +355,7 @@ class TestCreateSpan:
             span_id=None,
             parent_span_id=mock_active_span_instance.span_id,
             trace_id=mock_active_trace_instance.trace_id,
+            group_id=mock_active_trace_instance.group_id(),
             input={}, output={}, metadata={},
             queue_manager=mock_queue_manager_instance,
             span_type="STANDALONE"

scale_gp_beta-0.1.0a20/.release-please-manifest.json

@@ -1,3 +0,0 @@
-{
-  ".": "0.1.0-alpha.20"
-}