dagster-shared 1.12.11__py3-none-any.whl → 1.12.12__py3-none-any.whl

dagster_shared/telemetry/__init__.py

@@ -18,6 +18,7 @@ MAX_BYTES = 10485760  # 10 MB = 10 * 1024 * 1024 bytes
 DAGSTER_HOME_FALLBACK = "~/.dagster"
 TELEMETRY_STR = ".telemetry"
 INSTANCE_ID_STR = "instance_id"
+USER_ID_STR = "user_id"
 
 KNOWN_CI_ENV_VAR_KEYS = {
     "GITLAB_CI",  # https://docs.gitlab.com/ee/ci/variables/predefined_variables.html
@@ -84,6 +85,17 @@ def get_or_create_dir_from_dagster_home(target_dir: str) -> str:
     return dagster_home_logs_path
 
 
+def get_or_create_user_telemetry_dir() -> str:
+    """Always return ~/.dagster/.telemetry/, ignoring $DAGSTER_HOME.
+
+    This is used for user-level telemetry data (like user_id) that should be
+    consistent across all Dagster instances for a given user.
+    """
+    path = os.path.join(os.path.expanduser(DAGSTER_HOME_FALLBACK), TELEMETRY_STR)
+    os.makedirs(path, exist_ok=True)
+    return path
+
+
 class TelemetrySettings(NamedTuple):
     dagster_telemetry_enabled: bool
     instance_id: Optional[str]
@@ -154,6 +166,7 @@ class TelemetryEntry(
             ("event_id", str),
             ("elapsed_time", str),
             ("instance_id", str),
+            ("user_id", str),
             ("metadata", Mapping[str, str]),
             ("python_version", str),
             ("dagster_version", str),
@@ -173,7 +186,8 @@ class TelemetryEntry(
     client_time - Client time
     elapsed_time - Time elapsed between start of function and end of function call
     event_id - Unique id for the event
-    instance_id - Unique id for dagster instance
+    instance_id - Unique id for dagster instance (varies by $DAGSTER_HOME)
+    user_id - Unique id for the user (consistent across all instances, stored in ~/.dagster)
     python_version - Python version
     metadata - More information i.e. pipeline success (boolean)
     version - Schema version
@@ -192,6 +206,7 @@ class TelemetryEntry(
         client_time: str,
         event_id: str,
         instance_id: str,
+        user_id: str,
         metadata: Optional[Mapping[str, str]] = None,
         elapsed_time: Optional[str] = None,
         run_storage_id: Optional[str] = None,
@@ -206,6 +221,7 @@ class TelemetryEntry(
             elapsed_time=elapsed_time or "",
             event_id=event_id,
             instance_id=instance_id,
+            user_id=user_id,
             python_version=get_python_version(),
             metadata=metadata or {},
             dagster_version=__version__ or "None",
@@ -239,6 +255,7 @@ def log_telemetry_action(
                 elapsed_time=str(elapsed_time),
                 event_id=str(uuid.uuid4()),
                 instance_id=instance_id,
+                user_id=get_or_set_user_id(),
                 metadata=metadata,
                 run_storage_id=run_storage_id,
             )._asdict()
@@ -277,6 +294,56 @@ def get_or_set_instance_id() -> str:
     return instance_id
 
 
+def get_or_set_user_id() -> str:
+    """Get or create a user-level telemetry ID.
+
+    Unlike instance_id which varies by $DAGSTER_HOME, user_id is always stored
+    in ~/.dagster/.telemetry/user_id.yaml to ensure consistency across all
+    Dagster instances for a given user.
+    """
+    user_id = _get_telemetry_user_id()
+    if user_id is None:
+        user_id = _set_telemetry_user_id() or "<<unable_to_set_user_id>>"
+    return user_id
+
+
+def _get_telemetry_user_id() -> Optional[str]:
+    """Gets the user_id from ~/.dagster/.telemetry/user_id.yaml."""
+    import yaml
+
+    user_id_path = os.path.join(get_or_create_user_telemetry_dir(), "user_id.yaml")
+    if not os.path.exists(user_id_path):
+        return None
+
+    try:
+        with open(user_id_path, encoding="utf8") as user_id_file:
+            user_id_yaml = yaml.safe_load(user_id_file)
+            if (
+                user_id_yaml
+                and USER_ID_STR in user_id_yaml
+                and isinstance(user_id_yaml[USER_ID_STR], str)
+            ):
+                return user_id_yaml[USER_ID_STR]
+    except Exception:
+        pass
+    return None
+
+
+def _set_telemetry_user_id() -> Optional[str]:
+    """Sets the user_id at ~/.dagster/.telemetry/user_id.yaml."""
+    import yaml
+
+    user_id_path = os.path.join(get_or_create_user_telemetry_dir(), "user_id.yaml")
+    user_id = str(uuid.uuid4())
+
+    try:
+        with open(user_id_path, "w", encoding="utf8") as user_id_file:
+            yaml.dump({USER_ID_STR: user_id}, user_id_file, default_flow_style=False)
+        return user_id
+    except Exception:
+        return None
+
+
 # Gets the instance_id at $DAGSTER_HOME/.telemetry/id.yaml
 def _get_telemetry_instance_id() -> Optional[str]:
     import yaml

dagster_shared/utils/cached_method.py

@@ -1,6 +1,6 @@
-import asyncio
 from collections.abc import Callable, Hashable, Mapping
 from functools import wraps
+from inspect import iscoroutinefunction
 from typing import Any, Concatenate, TypeVar, cast
 
 from typing_extensions import ParamSpec
@@ -93,7 +93,7 @@ def cached_method(method: Callable[Concatenate[S, P], T]) -> Callable[Concatenat
 
         return canonical_kwargs
 
-    if asyncio.iscoroutinefunction(method):
+    if iscoroutinefunction(method):
 
         @wraps(method)
         async def _async_cached_method_wrapper(self: S, *args: P.args, **kwargs: P.kwargs) -> T:

dagster_shared/version.py

@@ -1 +1 @@
-__version__ = "1.12.11"
+__version__ = "1.12.12"

{dagster_shared-1.12.11.dist-info → dagster_shared-1.12.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dagster_shared
-Version: 1.12.11
+Version: 1.12.12
 Summary: Shared code between dagster and dagster-dg-core.
 Home-page: https://github.com/dagster-io/dagster/tree/master/python_modules/libraries/dagster-shared
 Author: Dagster Labs

{dagster_shared-1.12.11.dist-info → dagster_shared-1.12.12.dist-info}/RECORD

@@ -5,7 +5,7 @@ dagster_shared/match.py,sha256=P9wQSvzb7a03jXlC-0w9msoX5bV_BE1uSvdYvavNO6M,3444
 dagster_shared/merger.py,sha256=c9cJTwHtgMXgR9MtB-KwZEMtQSXn13rF08F2ID5aDTg,1758
 dagster_shared/modules.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dagster_shared/py.typed,sha256=mDShSrm8qg9qjacQc2F-rI8ATllqP6EdgHuEYxuCXZ0,7
-dagster_shared/version.py,sha256=V9Hrmon3VMx6Fm-BKFFV3DZcAfdU2IO-xs1MB4F4LlI,24
+dagster_shared/version.py,sha256=vKk1j8B-0kB8gelcQBK0OZVY0ogGIIA3KR4K_1iNmJQ,24
 dagster_shared/check/README.md,sha256=UlxRVMWJEoVAlaHWDvhobUpuNQGBG5-ddqZ6OIfLYnM,1352
 dagster_shared/check/__init__.py,sha256=CHSOqJpaeWr6skJT7jD8HnN5s4bdnoX4x94sGN55KqA,3482
 dagster_shared/check/builder.py,sha256=FvxiGCOCOgA5cWEDPXVF7c2grnjhR2dkuxEN3dRpoEI,17570
@@ -36,9 +36,9 @@ dagster_shared/seven/abc.py,sha256=vaqd-UGzvqAADutqU4O0V7-Hihe0vQNerj2SlCPJMFQ,5
 dagster_shared/seven/json.py,sha256=TElHKCmD71QJSDKvFP4e_vLMoSAFsAllPAbmplzSN30,383
 dagster_shared/seven/temp_dir.py,sha256=L03xfE14yxlcmjCI9NrViY36r4MMjaahfexJygMPaJo,354
 dagster_shared/seven/compat/__init__.py,sha256=8BqkAab5uZGmSyvBFpePjAaXR9seNDobs3TYI45nt5k,105
-dagster_shared/telemetry/__init__.py,sha256=_SLCyZSLGFmaZLujii-z7FK642ewI78Nm4eV8n-3Xxs,11335
+dagster_shared/telemetry/__init__.py,sha256=KeUTJmsmH3Xh4_6hRFAoIH9QdptnNogzygg4kwXebbI,13611
 dagster_shared/utils/__init__.py,sha256=m4QRhlvU_XCN3BWcUr_mead-7Ui4XvQJo3SIDgljirU,4310
-dagster_shared/utils/cached_method.py,sha256=WQj_xtSTO5qIejFqxnLXpjIMRsiWe8aJ0IcZkkWBWxY,7183
+dagster_shared/utils/cached_method.py,sha256=_l_cL-U98ZX8uZDPSLhKEOP3dZeTS6Of3RX9oV2gA_E,7200
 dagster_shared/utils/config.py,sha256=np_6pJ6r3xRKfV-cPeR6qVXebhj-Oznw3rhWP67miNM,3536
 dagster_shared/utils/hash.py,sha256=WA0FegijIAhMphC0gt30tTqpR6BecRk1GhIMtV71qbU,2060
 dagster_shared/utils/test.py,sha256=rF0eXymdihf25euuyfQrnH7w8dicUDFAIloKlmKXyZ0,20
@@ -47,8 +47,8 @@ dagster_shared/utils/warnings.py,sha256=yxiG8ghc3RwyomRItwIKQe6TrUdTlJAUX3BssOwe
 dagster_shared/yaml_utils/__init__.py,sha256=Ya7qT3aJGPC1TgD-pSkkhLX5U4QbrUkCsrUtZQeACXg,10529
 dagster_shared/yaml_utils/sample_yaml.py,sha256=YC-1h1P48F3QV-Uwo-MqzEkzlrMliXPfZM_X6ynZvTQ,5461
 dagster_shared/yaml_utils/source_position.py,sha256=yVSnHUkBYzWzLzqtyGbqRjH2b7oTeiE4K3b-uokYUIQ,9786
-dagster_shared-1.12.11.dist-info/licenses/LICENSE,sha256=hgU51ohULAFKZE2la8sartPYoUaAA14jxFAfFC4Tow0,11347
-dagster_shared-1.12.11.dist-info/METADATA,sha256=8tbBWqKKGVyiW5RlFwfuXnm28uTn9suJuhPB_IaJCpc,1148
-dagster_shared-1.12.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dagster_shared-1.12.11.dist-info/top_level.txt,sha256=S8ADcO4aTW07ONhLHXDxiuSkDzucgYKOlocB2x3r_dY,15
-dagster_shared-1.12.11.dist-info/RECORD,,
+dagster_shared-1.12.12.dist-info/licenses/LICENSE,sha256=hgU51ohULAFKZE2la8sartPYoUaAA14jxFAfFC4Tow0,11347
+dagster_shared-1.12.12.dist-info/METADATA,sha256=701-XPDihIqTjyXuiayhLchrhs617grhdcF6pEu_bt8,1148
+dagster_shared-1.12.12.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+dagster_shared-1.12.12.dist-info/top_level.txt,sha256=S8ADcO4aTW07ONhLHXDxiuSkDzucgYKOlocB2x3r_dY,15
+dagster_shared-1.12.12.dist-info/RECORD,,

{dagster_shared-1.12.11.dist-info → dagster_shared-1.12.12.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.1)
 Root-Is-Purelib: true
 Tag: py3-none-any