code-loader 1.0.116__tar.gz → 1.0.117rc0__tar.gz

{code_loader-1.0.116 → code_loader-1.0.117rc0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: code-loader
-Version: 1.0.116
+Version: 1.0.117rc0
 Summary: 
 License: MIT
 Author: dorhar

{code_loader-1.0.116 → code_loader-1.0.117rc0}/code_loader/mixpanel_tracker.py

@@ -4,8 +4,9 @@ Mixpanel tracking utilities for code-loader.
 import os
 import sys
 import getpass
+import uuid
 from typing import Optional, Dict, Any
-import mixpanel
+import mixpanel  # type: ignore[import]
 
 
 class MixpanelTracker:
@@ -16,7 +17,12 @@ class MixpanelTracker:
         self.mp = mixpanel.Mixpanel(token)
         self._user_id: Optional[str] = None
     
-    def _get_user_id(self) -> str:
+    def _get_whoami(self) -> str:
+        """Get the current system username (whoami) for device identification.
+        
+        Returns:
+            str: The system username, with fallbacks to environment variables or 'unknown'
+        """
         if self._user_id is None:
             try:
                 self._user_id = getpass.getuser()
@@ -25,6 +31,7 @@ class MixpanelTracker:
                 self._user_id = os.environ.get('USER', os.environ.get('USERNAME', 'unknown'))
         return self._user_id or 'unknown'
     
+       
     def _get_tensorleap_user_id(self) -> Optional[str]:
         """Get the TensorLeap user ID from ~/.tensorleap/user_id if it exists."""
         try:
@@ -38,33 +45,65 @@ class MixpanelTracker:
             pass
         return None
     
+    def _get_or_create_device_id(self) -> str:
+        """Get or create a device ID from ~/.tensorleap/device_id file.
+        
+        If the file doesn't exist, creates it with a new UUID.
+        
+        Returns:
+            str: The device ID (UUID string)
+        """
+        try:
+            device_id_path = os.path.expanduser("~/.tensorleap/device_id")
+            
+            # Create directory if it doesn't exist
+            os.makedirs(os.path.dirname(device_id_path), exist_ok=True)
+            
+            if os.path.exists(device_id_path):
+                with open(device_id_path, 'r') as f:
+                    device_id = f.read().strip()
+                    if device_id:
+                        return device_id
+            
+            # Generate new device ID and save it
+            device_id = str(uuid.uuid4())
+            with open(device_id_path, 'w') as f:
+                f.write(device_id)
+            
+            return device_id
+        except Exception:
+            # Fallback to generating a new UUID if file operations fail
+            return str(uuid.uuid4())
+    
     def _get_distinct_id(self) -> str:
         """Get the distinct ID for Mixpanel tracking.
         
         Priority order:
         1. TensorLeap user ID (from ~/.tensorleap/user_id)
-        2. System username (whoami)
-        3. 'unknown' as fallback
+        2. Device ID (from ~/.tensorleap/device_id, generated if not exists)
         """
         tensorleap_user_id = self._get_tensorleap_user_id()
         if tensorleap_user_id:
             return tensorleap_user_id
         
-        try:
-            return getpass.getuser()
-        except Exception:
-            # Final fallback
-            return os.environ.get('USER', os.environ.get('USERNAME', 'unknown'))
+        return self._get_or_create_device_id()
     
     def track_code_loader_loaded(self, event_properties: Optional[Dict[str, Any]] = None) -> None:
+        """Track code loader loaded event with device identification.
+        
+        Args:
+            event_properties: Optional additional properties to include in the event
+        """
         try:
             distinct_id = self._get_distinct_id()
             
             tensorleap_user_id = self._get_tensorleap_user_id()
-            whoami = self._get_user_id()
+            whoami = self._get_whoami()
+            device_id = self._get_or_create_device_id()
             
             properties = {
                 'whoami': whoami,
+                '$device_id': device_id,  # Always use device_id for $device_id
                 'python_version': f"{sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro}",
                 'platform': os.name,
             }

{code_loader-1.0.116 → code_loader-1.0.117rc0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "code-loader"
-version = "1.0.116"
+version = "1.0.117rc0"
 description = ""
 authors = ["dorhar <doron.harnoy@tensorleap.ai>"]
 license = "MIT"