scale-gp-beta 0.1.0a22__py3-none-any.whl → 0.1.0a23__py3-none-any.whl

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.22"  # x-release-please-version
+__version__ = "0.1.0-alpha.23"  # x-release-please-version

scale_gp_beta/lib/tracing/span.py

@@ -59,18 +59,18 @@ class BaseSpan:
         metadata: Optional[SpanMetadataParam] = None,
         span_type: SpanTypeLiterals = "STANDALONE"
     ):
-        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._name = name
+        self._trace_id: str = 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
         self.end_time: Optional[str] = None
-        self.input: SpanInputParam = input or {}
-        self.output: SpanOutputParam = output or {}
-        self.metadata: SpanMetadataParam = metadata or {}
-        self.span_type: SpanTypeLiterals = span_type
-        self.status: SpanStatusLiterals = "SUCCESS"
+        self._input: SpanInputParam = input or {}
+        self._output: SpanOutputParam = output or {}
+        self._metadata: SpanMetadataParam = metadata or {}
+        self._span_type: SpanTypeLiterals = span_type
+        self._status: SpanStatusLiterals = "SUCCESS"
         self._queue_manager = queue_manager
 
         self._contextvar_token: Optional[contextvars.Token[Optional[BaseSpan]]] = None
@@ -84,6 +84,73 @@ class BaseSpan:
     def flush(self, blocking: bool = True) -> None:
         pass
 
+    @property
+    def name(self) -> str:
+        return self._name
+
+    @property
+    def trace_id(self) -> str:
+        return self._trace_id
+
+    @property
+    def group_id(self) -> Optional[str]:
+        return self._group_id
+
+    @property
+    def span_id(self) -> str:
+        return self._span_id
+
+    @property
+    def parent_span_id(self) -> Optional[str]:
+        return self._parent_span_id
+
+    @property
+    def status(self) -> SpanStatusLiterals:
+        return self._status
+
+    @property
+    def span_type(self) -> SpanTypeLiterals:
+        return self._span_type
+
+    # with setters
+    @property
+    def metadata(self) -> SpanMetadataParam:
+        return self._metadata
+
+    @metadata.setter
+    def metadata(self, value: SpanMetadataParam) -> None:
+        self._metadata = value
+
+    @property
+    def input(self) -> SpanInputParam:
+        return self._input
+
+    @input.setter
+    def input(self, value: SpanInputParam) -> None:
+        self._input = value
+
+    @property
+    def output(self) -> SpanOutputParam:
+        return self._output
+
+    @output.setter
+    def output(self, value: SpanOutputParam) -> None:
+        self._output = value
+
+    def set_error(
+            self,
+            error_type: Optional[str] = None,
+            error_message: Optional[str] = None,
+            exception: Optional[BaseException] = None,
+    ) -> None:
+        # Naively record details in metadata for now, note that error capture only supported in context manager
+        exception_type = type(exception).__name__ if exception else None
+        exception_message = str(exception) if exception else None
+        self._status = "ERROR"
+        self.metadata["error"] = True
+        self.metadata["error_type"] = error_type or exception_type
+        self.metadata["error_message"] = error_message or exception_message
+
     def __enter__(self) -> BaseSpan:
         self.start()
         return self
@@ -94,13 +161,9 @@ class BaseSpan:
             exc_val: Optional[BaseException],
             exc_tb: Optional[TracebackType]
     ) -> None:
-        # Naively record details in metadata for now, note that error capture only supported in context manager
         # TODO: support error observations when using direct span.start() and span.end()
         if exc_type is not None:
-            self.metadata["error"] = True
-            self.metadata["error.type"] = exc_type.__name__
-            self.metadata["error.message"] = str(exc_val)
-            self.status = "ERROR"
+            self.set_error(exception=exc_val)
         self.end()
 
     def to_request_params(self) -> SpanCreateRequest:
@@ -203,7 +266,7 @@ class Span(BaseSpan):
     ):
         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
+        self._trace_id: str = trace_id
 
     @override
     def flush(self, blocking: bool = True) -> None:

scale_gp_beta/lib/tracing/trace.py

@@ -4,23 +4,30 @@ from types import TracebackType
 from typing import Type, Optional
 from typing_extensions import override
 
-from .span import Span, NoOpSpan
+from .span import Span, BaseSpan, NoOpSpan
 from .util import generate_trace_id
 from .scope import Scope
-from .types import SpanInputParam, SpanOutputParam, SpanTypeLiterals, SpanMetadataParam
+from .types import SpanInputParam, SpanOutputParam, SpanTypeLiterals, SpanMetadataParam, SpanStatusLiterals
 from .trace_queue_manager import TraceQueueManager
 
 log: logging.Logger = logging.getLogger(__name__)
 
 
 class BaseTrace:
-    def __init__(self, queue_manager: Optional[TraceQueueManager], trace_id: Optional[str] = None):
-        self.trace_id = trace_id or generate_trace_id()
+    def __init__(
+            self,
+            queue_manager: Optional[TraceQueueManager],
+            root_span: BaseSpan,
+            trace_id: str
+    ) -> None:
+        self._trace_id = trace_id
         self.queue_manager = queue_manager
 
         self._in_progress = False
         self._contextvar_token: Optional[contextvars.Token[Optional[BaseTrace]]] = None
 
+        self.root_span = root_span
+
     def start(self) -> None:
         pass
 
@@ -30,8 +37,62 @@ class BaseTrace:
     def flush(self, blocking: bool = True) -> None:
         pass
 
+    @property
+    def metadata(self) -> SpanMetadataParam:
+        return self.root_span.metadata
+
+    @metadata.setter
+    def metadata(self, value: SpanMetadataParam) -> None:
+        self.root_span.metadata = value
+
+    @property
+    def input(self) -> SpanInputParam:
+        return self.root_span.input
+
+    @input.setter
+    def input(self, value: SpanInputParam) -> None:
+        self.root_span.input = value
+
+    @property
+    def output(self) -> SpanOutputParam:
+        return self.root_span.output
+
+    @output.setter
+    def output(self, value: SpanOutputParam) -> None:
+        self.root_span.output = value
+
+    # no setters
+    @property
+    def name(self) -> Optional[str]:
+        return self.root_span.name
+
+    @property
+    def span_id(self) -> Optional[str]:
+        return self.root_span.span_id
+
+    @property
+    def trace_id(self) -> Optional[str]:
+        return self._trace_id
+
+    @property
     def group_id(self) -> Optional[str]:
-        return None
+        return self.root_span.group_id
+
+    @property
+    def span_type(self) -> SpanTypeLiterals:
+        return self.root_span.span_type
+
+    @property
+    def status(self) -> SpanStatusLiterals:
+        return self.root_span.status
+
+    def set_error(
+            self,
+            error_type: Optional[str] = None,
+            error_message: Optional[str] = None,
+            exception: Optional[BaseException] = None,
+    ) -> None:
+        self.root_span.set_error(error_type=error_type, error_message=error_message, exception=exception)
 
     def __enter__(self) -> "BaseTrace":
         self.start()
@@ -47,7 +108,12 @@ class BaseTrace:
 
     @override
     def __repr__(self) -> str:
-        return f"{self.__class__.__name__}(trace_id='{self.trace_id})"
+        return (
+            f"{self.__class__.__name__}("
+            f"trace_id='{self.trace_id}', "
+            f"root_span='{repr(self.root_span)}', "
+            ")"
+        )
 
     @override
     def __str__(self) -> str:
@@ -67,12 +133,11 @@ class NoOpTrace(BaseTrace):
             output: Optional[SpanOutputParam] = None,
             metadata: Optional[SpanMetadataParam] = None,
     ):
-        super().__init__(queue_manager, trace_id)
-
-        self.root_span = NoOpSpan(
+        trace_id = trace_id or generate_trace_id()
+        root_span = NoOpSpan(
             name=name,
             span_id=span_id,
-            trace_id=self.trace_id,
+            trace_id=trace_id,
             group_id=group_id,
             queue_manager=queue_manager,
             metadata=metadata,
@@ -80,15 +145,7 @@ class NoOpTrace(BaseTrace):
             input=input,
             output=output,
         )
-
-    @override
-    def __repr__(self) -> str:
-        return (
-            f"{self.__class__.__name__}("
-            f"trace_id='{self.trace_id}', "
-            f"root_span='{repr(self.root_span)}', "
-            ")"
-        )
+        super().__init__(queue_manager, root_span, trace_id)
 
     @override
     def start(self) -> None:
@@ -98,10 +155,6 @@ 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__(
@@ -116,13 +169,11 @@ class Trace(BaseTrace):
             output: Optional[SpanOutputParam] = None,
             metadata: Optional[SpanMetadataParam] = None,
     ):
-        super().__init__(queue_manager, trace_id)
-        self.queue_manager: TraceQueueManager = queue_manager
-
-        self.root_span = Span(
+        trace_id = trace_id or generate_trace_id()
+        root_span = Span(
             name=name,
             span_id=span_id,
-            trace_id=self.trace_id,
+            trace_id=trace_id,
             group_id=group_id,
             queue_manager=queue_manager,
             metadata=metadata,
@@ -130,6 +181,8 @@ class Trace(BaseTrace):
             input=input,
             output=output,
         )
+        super().__init__(queue_manager, root_span, trace_id)
+        self.queue_manager: TraceQueueManager = queue_manager
 
     @override
     def start(self) -> None:
@@ -162,16 +215,3 @@ class Trace(BaseTrace):
     @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 (
-            f"{self.__class__.__name__}("
-            f"trace_id='{self.trace_id}', "
-            f"root_span='{repr(self.root_span)}', "
-            ")"
-        )

scale_gp_beta/lib/tracing/tracing.py

@@ -182,7 +182,7 @@ 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_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
 

{scale_gp_beta-0.1.0a22.dist-info → scale_gp_beta-0.1.0a23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: scale-gp-beta
-Version: 0.1.0a22
+Version: 0.1.0a23
 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
@@ -31,7 +31,7 @@ Description-Content-Type: text/markdown
 
 # Scale GP Python API library
 
-[![PyPI version](https://img.shields.io/pypi/v/scale-gp-beta.svg)](https://pypi.org/project/scale-gp-beta/)
+[![PyPI version](https://github.com/scaleapi/sgp-python-beta/tree/main/<https://img.shields.io/pypi/v/scale-gp-beta.svg?label=pypi%20(stable)>)](https://pypi.org/project/scale-gp-beta/)
 
 The Scale GP Python library provides convenient access to the Scale GP REST API from any Python 3.8+
 application. The library includes type definitions for all request params and response fields,
@@ -578,7 +578,7 @@ client.with_options(max_retries=5).chat.completions.create(
 ### Timeouts
 
 By default requests time out after 1 minute. You can configure this with a `timeout` option,
-which accepts a float or an [`httpx.Timeout`](https://www.python-httpx.org/advanced/#fine-tuning-the-configuration) object:
+which accepts a float or an [`httpx.Timeout`](https://www.python-httpx.org/advanced/timeouts/#fine-tuning-the-configuration) object:
 
 ```python
 from scale_gp_beta import SGPClient

{scale_gp_beta-0.1.0a22.dist-info → scale_gp_beta-0.1.0a23.dist-info}/RECORD

@@ -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=JLVPWU9jvr2kcPJpjRIxvVmQjhYdVN2g4Wjh0V9d8zc,174
+scale_gp_beta/_version.py,sha256=PVHPnDC4m4CLgie5tfMTyuGdRwriv_lcwpf658BXOZ8,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=_XocyodHFJsIihEOyFKtdojdsUR2wayqoRL7Kj60PVQ,9671
-scale_gp_beta/lib/tracing/trace.py,sha256=GEzE78sulYKooz46vtZ7JI77_KDCOpQBfYsahZE_7HU,5084
+scale_gp_beta/lib/tracing/span.py,sha256=VVibUzWAjENw80JH7JCMF2LbXr0aN9HNudduZBW0rx0,11260
+scale_gp_beta/lib/tracing/trace.py,sha256=sdLUnvByLaMbV2TgI-MdKKs7If1-6GKz5j9A6scnDoI,6205
 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=kGoUo3Kf172iJudzFIomXvQ_2aiWPr_38wqbKFX4rGo,8837
+scale_gp_beta/lib/tracing/tracing.py,sha256=piSl0HsC442wcgjyBU7FLJszY0EoYaGxyRIy_uocR_o,8835
 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.0a22.dist-info/METADATA,sha256=Ex9RXx9qwGNdoyA56V6KvsQb4Z0FVQRJHN8i-irCkqI,27524
-scale_gp_beta-0.1.0a22.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-scale_gp_beta-0.1.0a22.dist-info/licenses/LICENSE,sha256=x49Bj8r_ZpqfzThbmfHyZ_bE88XvHdIMI_ANyLHFFRE,11338
-scale_gp_beta-0.1.0a22.dist-info/RECORD,,
+scale_gp_beta-0.1.0a23.dist-info/METADATA,sha256=EUWqFlefgJo-cCYXL1QNdQ-zhzw6XZaM1k8k0a9cmqw,27611
+scale_gp_beta-0.1.0a23.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+scale_gp_beta-0.1.0a23.dist-info/licenses/LICENSE,sha256=x49Bj8r_ZpqfzThbmfHyZ_bE88XvHdIMI_ANyLHFFRE,11338
+scale_gp_beta-0.1.0a23.dist-info/RECORD,,