chalkpy 2.95.3__tar.gz → 2.95.4__tar.gz

{chalkpy-2.95.3 → chalkpy-2.95.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chalkpy
-Version: 2.95.3
+Version: 2.95.4
 Summary: Python SDK for Chalk
 Author: Chalk AI, Inc.
 Project-URL: Homepage, https://chalk.ai

chalkpy-2.95.4/chalk/_version.py

@@ -0,0 +1 @@
+__version__ = "2.95.4"

{chalkpy-2.95.3 → chalkpy-2.95.4}/chalk/features/feature_set_decorator.py

@@ -1311,7 +1311,7 @@ def _process_class(
                 )
                 cls_cast = cast(Type, cls)
                 if not f_i.is_typ_set():
-                    f_i.typ = ParsedAnnotation(cls_cast, f.name)
+                    f_i.typ = ParsedAnnotation(cls_cast, f.attribute_name)
 
                 f_i.features_cls = cls_cast
                 f_i.attribute_name = f"{f.attribute_name}_v{i}"
@@ -1329,9 +1329,18 @@ def _process_class(
                     class_cache_strategy=cache_strategy,
                     error_builder=error_builder,
                 )
+
+                # copy over expressions for default version
+                if i == f.version.default:
+                    if f.underscore_expression is None and f_i.underscore_expression is not None:
+                        f.underscore_expression = f_i.underscore_expression
+                    if f.offline_underscore_expression is None and f_i.offline_underscore_expression is not None:
+                        f.offline_underscore_expression = f_i.offline_underscore_expression
+
                 f.version.reference[i] = f_i
                 # The default feature already exists.
                 f_i.no_display = i == f.version.default
+                cls_fields.append(f_i)
             continue
 
         for i in range(1, f.version.maximum + 1):

{chalkpy-2.95.3 → chalkpy-2.95.4}/chalk/utils/tracing.py

@@ -5,7 +5,7 @@ import os
 import threading
 import time
 import types
-from typing import TYPE_CHECKING, Any, Mapping, Union, cast
+from typing import TYPE_CHECKING, Any, Callable, Mapping, Union, cast
 
 from chalk.utils._ddtrace_version import can_use_datadog_statsd, can_use_ddtrace
 from chalk.utils._otel_version import can_use_otel_trace
@@ -16,6 +16,41 @@ if TYPE_CHECKING:
     import ddtrace.context
     from opentelemetry import trace as otel_trace
 
+
+class Once:
+    """Execute a function exactly once and block all callers until the function returns
+
+    Same as golang's `sync.Once <https://pkg.go.dev/sync#Once>`_
+    """
+
+    def __init__(self) -> None:
+        self._lock = threading.Lock()
+        self._done = False
+        super().__init__()
+
+    def do_once(self, func: Callable[[], None]) -> bool:
+        """Execute ``func`` if it hasn't been executed or return.
+
+        Will block until ``func`` has been called by one thread.
+
+        Returns:
+            Whether or not ``func`` was executed in this call
+        """
+
+        # fast path, try to avoid locking
+        if self._done:
+            return False
+
+        with self._lock:
+            if not self._done:
+                func()
+                self._done = True
+                return True
+        return False
+
+
+_TRACING_CONFIGURED = Once()
+
 _logger = get_logger(__name__)
 
 if can_use_otel_trace:
@@ -27,6 +62,7 @@ if can_use_otel_trace:
 
     @contextlib.contextmanager
     def safe_trace(span_id: str, attributes: Mapping[str, str] | None = None):  # pyright: ignore[reportRedeclaration]
+        configure_tracing("chalkpy")
         if attributes is None:
             attributes = {}
         attributes = dict(attributes)
@@ -36,14 +72,17 @@ if can_use_otel_trace:
             yield span
 
     def safe_add_metrics(metrics: Mapping[str, Union[int, float]]):  # pyright: ignore[reportRedeclaration]
+        configure_tracing("chalkpy")
         current_span = otel_trace.get_current_span()
         current_span.set_attributes(dict(metrics))
 
     def safe_add_tags(tags: Mapping[str, str]):
+        configure_tracing("chalkpy")
         current_span = otel_trace.get_current_span()
         current_span.set_attributes(dict(tags))
 
     def safe_current_trace_context() -> ddtrace.context.Context | otel_trace.SpanContext | None:  # pyright: ignore[reportRedeclaration]
+        configure_tracing("chalkpy")
         return otel_trace.get_current_span().get_span_context()
 
     @contextlib.contextmanager
@@ -53,6 +92,7 @@ if can_use_otel_trace:
         | otel_trace.SpanContext
         | None,  # pyright: ignore[reportPrivateImportUsage]
     ):
+        configure_tracing("chalkpy")
         if isinstance(ctx, otel_trace.SpanContext):
             new_span = otel_trace.NonRecordingSpan(ctx)
             new_context = otel_trace.set_span_in_context(new_span)
@@ -65,6 +105,7 @@ if can_use_otel_trace:
     def add_trace_headers(  # pyright: ignore[reportRedeclaration]
         input_headers: None | dict[str, str]
     ) -> dict[str, str]:
+        configure_tracing("chalkpy")
         current_span_ctx = otel_trace.get_current_span().get_span_context()
         new_span_ctx = otel_trace.SpanContext(
             trace_id=current_span_ctx.trace_id,
@@ -86,6 +127,7 @@ elif can_use_ddtrace:
 
     @contextlib.contextmanager
     def safe_trace(span_id: str, attributes: Mapping[str, str] | None = None):  # pyright: ignore[reportRedeclaration]
+        configure_tracing("chalkpy")
         if not ddtrace.tracer.enabled:
             yield
             return
@@ -106,16 +148,19 @@ elif can_use_ddtrace:
             yield
 
     def safe_add_metrics(metrics: Mapping[str, Union[int, float]]):  # pyright: ignore[reportRedeclaration]
+        configure_tracing("chalkpy")
         span = ddtrace.tracer.current_span()
         if span:
             span.set_metrics(cast(Any, metrics))
 
     def safe_add_tags(tags: Mapping[str, str]):  # pyright: ignore[reportRedeclaration]
+        configure_tracing("chalkpy")
         span = ddtrace.tracer.current_span()
         if span:
             span.set_tags(cast(Any, tags))
 
     def safe_current_trace_context() -> ddtrace.context.Context | otel_trace.SpanContext | None:  # pyright: ignore[reportRedeclaration]
+        configure_tracing("chalkpy")
         return ddtrace.tracer.current_trace_context()
 
     @contextlib.contextmanager
@@ -125,6 +170,7 @@ elif can_use_ddtrace:
         | otel_trace.SpanContext
         | None,  # pyright: ignore[reportPrivateImportUsage]
     ):
+        configure_tracing("chalkpy")
         if isinstance(ctx, ddtrace.context.Context) or isinstance(ctx, ddtrace.Span):
             ddtrace.tracer.context_provider.activate(ctx)
         yield
@@ -132,6 +178,7 @@ elif can_use_ddtrace:
     def add_trace_headers(  # pyright: ignore[reportRedeclaration]
         input_headers: None | dict[str, str]
     ) -> dict[str, str]:
+        configure_tracing("chalkpy")
         headers: dict[str, str] = dict(input_headers if input_headers is not None else {})
         span = ddtrace.tracer.current_span()
         if span:
@@ -223,74 +270,74 @@ class PerfTimer:
 
 
 def configure_tracing(default_service_name: str):
-    from chalk.utils.log_with_context import get_logger
-
-    _logger = get_logger(__name__)
-
-    if can_use_otel_trace:
-        from opentelemetry import trace as otel_trace
-        from opentelemetry.sdk.resources import Resource
-        from opentelemetry.sdk.trace import TracerProvider
-
-        provider = TracerProvider(
-            resource=Resource.create(
-                {
-                    "service.name": default_service_name,
-                }
-            ),
-        )
-        otel_trace.set_tracer_provider(provider)
-
-    elif can_use_ddtrace:
-        import ddtrace
-        from ddtrace.filters import FilterRequestsOnUrl
-
-        if ddtrace.config.service is None:
-            ddtrace.config.service = default_service_name
-        # Re-configuring the global tracer to capture any setting changes from environs from a .dotenv file
-        # which might be loaded after the first ddtrace import
-
-        ddtrace.tracer.configure(
-            enabled=None if "DD_TRACE_ENABLED" not in os.environ else env_var_bool("DD_TRACE_ENABLED"),
-            hostname=os.getenv("DD_AGENT_HOST") or os.getenv("DD_TRACE_AGENT_URL"),
-            uds_path=os.getenv("DD_TRACE_AGENT_URL"),
-            dogstatsd_url=os.getenv("DD_DOGSTATSD_URL"),
-            api_version=os.getenv("DD_TRACE_API_VERSION"),
-            compute_stats_enabled=env_var_bool("DD_TRACE_COMPUTE_STATS"),
-            iast_enabled=None if "DD_IAST_ENABLED" not in os.environ else env_var_bool("DD_IAST_ENABLED"),
-            # exclude healthcheck url from apm trace collection
-            settings={
-                "FILTERS": [
-                    FilterRequestsOnUrl(
-                        [
-                            r"^http://.*/healthcheck$",
-                            r"^http://.*/ready$",
-                            r"^http://[^/]*/$",  # exclude "/"
-                        ]
-                    )
-                ]
-            },
-        )
-        if ddtrace.tracer.enabled:
-            ddtrace.patch(
-                asyncio=True,
-                databricks=False,
-                fastapi=True,
-                futures=True,
-                httplib=True,
-                httpx=True,
-                psycopg=True,
-                redis=True,
-                requests=True,
-                sqlalchemy=False,
-                urllib3=True,
+    def do_configure_tracing():
+        from chalk.utils.log_with_context import get_logger
+
+        _logger = get_logger(__name__)
+
+        if can_use_otel_trace:
+            from opentelemetry import trace as otel_trace
+            from opentelemetry.sdk.resources import Resource
+            from opentelemetry.sdk.trace import TracerProvider
+
+            provider = TracerProvider(
+                resource=Resource.create(
+                    {
+                        "service.name": default_service_name,
+                    }
+                ),
             )
+            otel_trace.set_tracer_provider(provider)
+
+        elif can_use_ddtrace:
+            import ddtrace
+            from ddtrace.filters import FilterRequestsOnUrl
+
+            if ddtrace.config.service is None:
+                ddtrace.config.service = default_service_name
+            # Re-configuring the global tracer to capture any setting changes from environs from a .dotenv file
+            # which might be loaded after the first ddtrace import
+
+            ddtrace.tracer.configure(
+                enabled=None if "DD_TRACE_ENABLED" not in os.environ else env_var_bool("DD_TRACE_ENABLED"),
+                hostname=os.getenv("DD_AGENT_HOST") or os.getenv("DD_TRACE_AGENT_URL"),
+                uds_path=os.getenv("DD_TRACE_AGENT_URL"),
+                dogstatsd_url=os.getenv("DD_DOGSTATSD_URL"),
+                api_version=os.getenv("DD_TRACE_API_VERSION"),
+                compute_stats_enabled=env_var_bool("DD_TRACE_COMPUTE_STATS"),
+                iast_enabled=None if "DD_IAST_ENABLED" not in os.environ else env_var_bool("DD_IAST_ENABLED"),
+                # exclude healthcheck url from apm trace collection
+                settings={
+                    "FILTERS": [
+                        FilterRequestsOnUrl(
+                            [
+                                r"^http://.*/healthcheck$",
+                                r"^http://.*/ready$",
+                                r"^http://[^/]*/$",  # exclude "/"
+                            ]
+                        )
+                    ]
+                },
+            )
+            if ddtrace.tracer.enabled:
+                ddtrace.patch(
+                    asyncio=True,
+                    databricks=False,
+                    fastapi=True,
+                    futures=True,
+                    httplib=True,
+                    httpx=True,
+                    psycopg=True,
+                    redis=True,
+                    requests=True,
+                    sqlalchemy=False,
+                    urllib3=True,
+                )
 
-        _logger.info(
-            f"Configuring DDtrace tracing: enabled={ddtrace.tracer.enabled}, service={ddtrace.config.service}, env={ddtrace.config.env}, trace_agent_url: {ddtrace.config._trace_agent_url}, effective trace agent: {ddtrace.tracer._agent_url}"  # pyright: ignore [reportAttributeAccessIssue, reportPrivateUsage]
-        )
-    else:
-        _logger.warning("neither opentelemetry nor ddtrace are installed")
-
+            _logger.info(
+                f"Configuring DDtrace tracing: enabled={ddtrace.tracer.enabled}, service={ddtrace.config.service}, env={ddtrace.config.env}, trace_agent_url: {ddtrace.config._trace_agent_url}, effective trace agent: {ddtrace.tracer._agent_url}"  # pyright: ignore [reportAttributeAccessIssue, reportPrivateUsage]
+            )
+        else:
+            _logger.warning("neither opentelemetry nor ddtrace are installed")
 
-configure_tracing("chalkpy")
+    _TRACING_CONFIGURED.do_once(do_configure_tracing)

chalkpy-2.95.3/chalk/_version.py

@@ -1 +0,0 @@
-__version__ = "2.95.3"