scale-gp-beta 0.1.0a20__py3-none-any.whl → 0.1.0a21__py3-none-any.whl

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/_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/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/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/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.dist-info → scale_gp_beta-0.1.0a21.dist-info}/METADATA

@@ -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.dist-info → scale_gp_beta-0.1.0a21.dist-info}/RECORD

@@ -1,5 +1,5 @@
 scale_gp_beta/__init__.py,sha256=x8toPf2r1c14qt9Fvh5cjeX1tytmAWa3lMc4tg9SYKY,2646
-scale_gp_beta/_base_client.py,sha256=kt2Ghc1tCF5ImtzfGM1y3vvGxsE-KJIqrDcnRfsMaGo,65099
+scale_gp_beta/_base_client.py,sha256=u6z6Qxu3eqzfbcDx-zlIUtbuPWF9MgeygEi6H8HN4X8,65891
 scale_gp_beta/_client.py,sha256=3pNXJs9TKLjfYoTjFIIoSdd4mwwX1cc-VUveMBmkl_8,24491
 scale_gp_beta/_compat.py,sha256=VWemUKbj6DDkQ-O4baSpHVLJafotzeXmCQGJugfVTIw,6580
 scale_gp_beta/_constants.py,sha256=S14PFzyN9-I31wiV7SmIlL5Ga0MLHxdvegInGdXH7tM,462
@@ -11,7 +11,7 @@ scale_gp_beta/_resource.py,sha256=siZly_U6D0AOVLAzaOsqUdEFFzVMbWRj-ml30nvRp7E,11
 scale_gp_beta/_response.py,sha256=GemuybPk0uemovTlGHyHkj-ScYTTDJA0jqH5FQqIPwQ,28852
 scale_gp_beta/_streaming.py,sha256=fcCSGXslmi2SmmkM05g2SACXHk2Mj7k1X5uMBu6U5s8,10112
 scale_gp_beta/_types.py,sha256=0wSs40TefKMPBj2wQKenEeZ0lzedoHClNJeqrpAgkII,6204
-scale_gp_beta/_version.py,sha256=6UZbVIfacMp5Bp3n8ioyF0Rlmq1dDufS-TfPMR72s4w,174
+scale_gp_beta/_version.py,sha256=eAvv8VO77KuKq0s3gmUyyDz59GNsypYW7UrSDWHIN9s,174
 scale_gp_beta/pagination.py,sha256=t-U86PYxl20VRsz8VXOMJJDe7HxkX7ISFMvRNbBNy9s,4054
 scale_gp_beta/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scale_gp_beta/_utils/__init__.py,sha256=PNZ_QJuzZEgyYXqkO1HVhGkj5IU9bglVUcw7H-Knjzw,2062
@@ -28,11 +28,11 @@ scale_gp_beta/lib/.keep,sha256=wuNrz-5SXo3jJaJOJgz4vFHM41YH_g20F5cRQo0vLes,224
 scale_gp_beta/lib/tracing/__init__.py,sha256=UgyExbqAA2ljDEF4X4YFhtbBZuoQJ2IF4hkGs_xQEc0,226
 scale_gp_beta/lib/tracing/exceptions.py,sha256=vL2_GAfWEy8EfLhrBkDClLYTasOLnL-5zUpdCQnSzcs,107
 scale_gp_beta/lib/tracing/scope.py,sha256=kHrd0his8L2K_KXn2E6J9d565PliEdFoKRQ1d5ALTyk,3901
-scale_gp_beta/lib/tracing/span.py,sha256=RBTpNPxwmovcC3OzyApNbgnK2mA5kv8Ml6LH89dQsbg,9456
-scale_gp_beta/lib/tracing/trace.py,sha256=iArpvjoJd8_lxSKi5CJ1Gw_VIpJo4qQoBWv4yT2KHOs,4501
+scale_gp_beta/lib/tracing/span.py,sha256=_XocyodHFJsIihEOyFKtdojdsUR2wayqoRL7Kj60PVQ,9671
+scale_gp_beta/lib/tracing/trace.py,sha256=GEzE78sulYKooz46vtZ7JI77_KDCOpQBfYsahZE_7HU,5084
 scale_gp_beta/lib/tracing/trace_exporter.py,sha256=bE6hS-Qu9KknEUTdsfIQMQwauah125mEavTDqEenBRA,3779
 scale_gp_beta/lib/tracing/trace_queue_manager.py,sha256=xywP3myhaHX52i52ZfC2_-ONrd-4_aL-f3-3jNhh2XY,5961
-scale_gp_beta/lib/tracing/tracing.py,sha256=94WJrqIxU1iFtF8CGsD2uvrJ1AnY9RgpW-wNTNHSvYg,8254
+scale_gp_beta/lib/tracing/tracing.py,sha256=kGoUo3Kf172iJudzFIomXvQ_2aiWPr_38wqbKFX4rGo,8837
 scale_gp_beta/lib/tracing/types.py,sha256=fnU7XGiyfF3UEIx-iqyHRjNHlOV7s75tP0b5efvt2sk,1156
 scale_gp_beta/lib/tracing/util.py,sha256=8Oq4wLXRNOzh3CC1zRaBEr0h_WdXLrk536BUNKRddVE,1527
 scale_gp_beta/resources/__init__.py,sha256=Fyo05_2_pc5orfyTSIpxa3btmBTd45VasgibwSqbbKo,4942
@@ -117,7 +117,7 @@ scale_gp_beta/types/chat/completion_models_params.py,sha256=ETxafJIUx4tTvkiR-ZCr
 scale_gp_beta/types/chat/completion_models_response.py,sha256=Ctgj6o-QWPSdjBKzG9J4Id0-DjXu4UGGw1NR6-840Ec,403
 scale_gp_beta/types/chat/model_definition.py,sha256=NNgopTm900GD0Zs2YHkcvoW67uKaWUKVyPbhKBHvKdQ,817
 scale_gp_beta/types/files/__init__.py,sha256=OKfJYcKb4NObdiRObqJV_dOyDQ8feXekDUge2o_4pXQ,122
-scale_gp_beta-0.1.0a20.dist-info/METADATA,sha256=Vq4QI-Qk5UHS52GDxna_KAZ1Bd3PzxoewR2c_RtaMJk,16881
-scale_gp_beta-0.1.0a20.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-scale_gp_beta-0.1.0a20.dist-info/licenses/LICENSE,sha256=x49Bj8r_ZpqfzThbmfHyZ_bE88XvHdIMI_ANyLHFFRE,11338
-scale_gp_beta-0.1.0a20.dist-info/RECORD,,
+scale_gp_beta-0.1.0a21.dist-info/METADATA,sha256=ZSHBKPl86WyhjRcUXYbMKDvPUAmeodrSMGKQ6S9QAQo,16881
+scale_gp_beta-0.1.0a21.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+scale_gp_beta-0.1.0a21.dist-info/licenses/LICENSE,sha256=x49Bj8r_ZpqfzThbmfHyZ_bE88XvHdIMI_ANyLHFFRE,11338
+scale_gp_beta-0.1.0a21.dist-info/RECORD,,