code-loader 1.0.143__tar.gz → 1.0.143.dev3__tar.gz

{code_loader-1.0.143 → code_loader-1.0.143.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: code-loader
-Version: 1.0.143
+Version: 1.0.143.dev3
 Summary: 
 Home-page: https://github.com/tensorleap/code-loader
 License: MIT

{code_loader-1.0.143 → code_loader-1.0.143.dev3}/code_loader/inner_leap_binder/leapbinder_decorators.py

@@ -1,14 +1,18 @@
 # mypy: ignore-errors
 import os
 import warnings
+import logging
 from collections import defaultdict
 from functools import lru_cache
 from pathlib import Path
+from typing import Optional, Union, Callable, List, Dict, Set, Any
 from typing import Optional, Union, Callable, List, Dict, get_args, get_origin
 
 import numpy as np
 import numpy.typing as npt
 
+logger = logging.getLogger(__name__)
+
 from code_loader.contract.datasetclasses import CustomCallableInterfaceMultiArgs, \
     CustomMultipleReturnCallableInterfaceMultiArgs, ConfusionMatrixCallableInterfaceMultiArgs, CustomCallableInterface, \
     VisualizerCallableInterface, MetadataSectionCallableInterface, PreprocessResponse, SectionCallableInterface, \
@@ -20,6 +24,7 @@ from code_loader.contract.mapping import NodeMapping, NodeMappingType, NodeConne
 from code_loader.contract.visualizer_classes import LeapImage, LeapImageMask, LeapTextMask, LeapText, LeapGraph, \
     LeapHorizontalBar, LeapImageWithBBox, LeapImageWithHeatmap
 from code_loader.inner_leap_binder.leapbinder import mapping_runtime_mode_env_var_mame
+from code_loader.mixpanel_tracker import clear_integration_events, AnalyticsEvent, emit_integration_event_once
 
 import inspect
 import functools
@@ -172,6 +177,11 @@ def tensorleap_integration_test():
             _validate_input_args(*args, **kwargs)
 
             global _called_from_inside_tl_integration_test_decorator
+            # Clear integration test events for new test
+            try:
+                clear_integration_events()
+            except Exception as e:
+                logger.debug(f"Failed to clear integration events: {e}")
             try:
                 _called_from_inside_tl_integration_test_decorator = True
                 if not _call_from_tl_platform:
@@ -489,7 +499,7 @@ def tensorleap_custom_metric(name: str,
                                 f'Please choose another')
 
         def _validate_input_args(*args, **kwargs) -> None:
-            assert len(args) > 0, (
+            assert len(args)+len(kwargs) > 0, (
                 f"{user_function.__name__}() validation failed: "
                 f"Expected at least one positional|key-word argument of type np.ndarray, "
                 f"but received none. "
@@ -660,7 +670,7 @@ def tensorleap_custom_visualizer(name: str, visualizer_type: LeapDataType,
                                 f'Please choose another')
 
         def _validate_input_args(*args, **kwargs):
-            assert len(args) > 0, (
+            assert len(args) + len(kwargs) > 0, (
                 f"{user_function.__name__}() validation failed: "
                 f"Expected at least one positional|key-word argument of type np.ndarray, "
                 f"but received none. "
@@ -884,7 +894,7 @@ def tensorleap_preprocess():
         leap_binder.set_preprocess(user_function)
 
         def _validate_input_args(*args, **kwargs):
-            assert len(args) == 0 and len(kwargs) == 0, \
+            assert len(args) + len(kwargs) > 0, \
                 (f'{user_function.__name__}() validation failed: '
                  f'The function should not take any arguments. Got {args} and {kwargs}.')
 
@@ -911,6 +921,14 @@ def tensorleap_preprocess():
             _validate_input_args(*args, **kwargs)
             result = user_function()
             _validate_result(result)
+
+            # Emit integration test event once per test
+            try:
+                emit_integration_event_once(AnalyticsEvent.PREPROCESS_INTEGRATION_TEST, {
+                    'preprocess_responses_count': len(result)
+                })
+            except Exception as e:
+                logger.debug(f"Failed to emit preprocess integration test event: {e}")
             if not _call_from_tl_platform:
                 update_env_params_func("tensorleap_preprocess", "v")
             return result
@@ -1154,6 +1172,15 @@ def tensorleap_input_encoder(name: str, channel_dim=-1, model_input_index=None):
             if _called_from_inside_tl_decorator == 0 and _called_from_inside_tl_integration_test_decorator:
                 batch_warning(result,user_function.__name__)
                 result = np.expand_dims(result, axis=0)
+                # Emit integration test event once per test
+                try:
+                    emit_integration_event_once(AnalyticsEvent.INPUT_ENCODER_INTEGRATION_TEST, {
+                        'encoder_name': name,
+                        'channel_dim': channel_dim,
+                        'model_input_index': model_input_index
+                    })
+                except Exception as e:
+                    logger.debug(f"Failed to emit input_encoder integration test event: {e}")
             if not _call_from_tl_platform:
                 update_env_params_func("tensorleap_input_encoder", "v")
 
@@ -1239,6 +1266,13 @@ def tensorleap_gt_encoder(name: str):
             if _called_from_inside_tl_decorator == 0 and _called_from_inside_tl_integration_test_decorator:
                 batch_warning(result, user_function.__name__)
                 result = np.expand_dims(result, axis=0)
+                # Emit integration test event once per test
+                try:
+                    emit_integration_event_once(AnalyticsEvent.GT_ENCODER_INTEGRATION_TEST, {
+                        'encoder_name': name
+                    })
+                except Exception as e:
+                    logger.debug(f"Failed to emit gt_encoder integration test event: {e}")
             if not _call_from_tl_platform:
                 update_env_params_func("tensorleap_gt_encoder", "v")
             return result
@@ -1281,7 +1315,7 @@ def tensorleap_custom_loss(name: str, connects_to=None):
         valid_types = (np.ndarray, SamplePreprocessResponse)
 
         def _validate_input_args(*args, **kwargs):
-            assert len(args) > 0 and len(kwargs)==0, (
+            assert len(args) + len(kwargs) > 0, (
                 f"{user_function.__name__}() validation failed: "
                 f"Expected at least one positional|key-word argument of the allowed types (np.ndarray|SamplePreprocessResponse|list(np.ndarray|SamplePreprocessResponse)). "
                 f"but received none. "

{code_loader-1.0.143 → code_loader-1.0.143.dev3}/code_loader/mixpanel_tracker.py

@@ -5,12 +5,53 @@ import os
 import sys
 import getpass
 import uuid
-from typing import Optional, Dict, Any
+import logging
+from enum import Enum
+from typing import Optional, Dict, Any, Set, Union, TypedDict
 import mixpanel  # type: ignore[import]
 
+logger = logging.getLogger(__name__)
+
 TRACKING_VERSION = '1'
 
 
+class AnalyticsEvent(str, Enum):
+    """Enumeration of all tracked analytics events."""
+    CODE_LOADER_LOADED = "code_loader_loaded"
+    LOAD_MODEL_INTEGRATION_TEST = "load_model_integration_test"
+    PREPROCESS_INTEGRATION_TEST = "preprocess_integration_test"
+    INPUT_ENCODER_INTEGRATION_TEST = "input_encoder_integration_test"
+    GT_ENCODER_INTEGRATION_TEST = "gt_encoder_integration_test"
+
+
+class CodeLoaderLoadedProps(TypedDict, total=False):
+    """Properties for code_loader_loaded event."""
+    event_type: str
+    code_path: str
+    code_entry_name: str
+
+
+class LoadModelEventProps(TypedDict, total=False):
+    """Properties for load_model_integration_test event."""
+    prediction_types_count: int
+
+
+class PreprocessEventProps(TypedDict, total=False):
+    """Properties for preprocess_integration_test event."""
+    preprocess_responses_count: int
+
+
+class InputEncoderEventProps(TypedDict, total=False):
+    """Properties for input_encoder_integration_test event."""
+    encoder_name: str
+    channel_dim: int
+
+
+class GtEncoderEventProps(TypedDict, total=False):
+    """Properties for gt_encoder_integration_test event."""
+    encoder_name: str
+
+
 class MixpanelTracker:
     """Handles Mixpanel event tracking for code-loader."""
     
@@ -28,7 +69,8 @@ class MixpanelTracker:
         if self._user_id is None:
             try:
                 self._user_id = getpass.getuser()
-            except Exception:
+            except Exception as e:
+                logger.debug(f"Failed to get username via getpass: {e}")
                 # Fallback to environment variables or default
                 self._user_id = os.environ.get('USER', os.environ.get('USERNAME', 'unknown'))
         return self._user_id or 'unknown'
@@ -43,8 +85,8 @@ class MixpanelTracker:
                     user_id = f.read().strip()
                     if user_id:
                         return user_id
-        except Exception:
-            pass
+        except Exception as e:
+            logger.debug(f"Failed to read TensorLeap user ID: {e}")
         return None
     
     def _get_or_create_device_id(self) -> str:
@@ -73,7 +115,8 @@ class MixpanelTracker:
                 f.write(device_id)
             
             return device_id
-        except Exception:
+        except Exception as e:
+            logger.debug(f"Failed to read/write device ID file: {e}")
             # Fallback to generating a new UUID if file operations fail
             return str(uuid.uuid4())
     
@@ -90,10 +133,11 @@ class MixpanelTracker:
         
         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.
+    def _track_event(self, event_name: Union[str, AnalyticsEvent], event_properties: Optional[Dict[str, Any]] = None) -> None:
+        """Internal method to track any event with device identification.
         
         Args:
+            event_name: The name of the event to track (string or AnalyticsEvent enum)
             event_properties: Optional additional properties to include in the event
         """
         # Skip tracking if IS_TENSORLEAP_PLATFORM environment variable is set to 'true'
@@ -122,9 +166,26 @@ class MixpanelTracker:
             if event_properties:
                 properties.update(event_properties)
             
-            self.mp.track(distinct_id, 'code_loader_loaded', properties)
+            self.mp.track(distinct_id, str(event_name), properties)
         except Exception as e:
-            pass
+            logger.debug(f"Failed to track event '{event_name}': {e}")
+
+    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
+        """
+        self._track_event(AnalyticsEvent.CODE_LOADER_LOADED, event_properties)
+
+    def track_integration_test_event(self, event_name: Union[str, AnalyticsEvent], event_properties: Optional[Dict[str, Any]] = None) -> None:
+        """Track an integration test event with device identification.
+        
+        Args:
+            event_name: The name of the event to track (string or AnalyticsEvent enum)
+            event_properties: Optional additional properties to include in the event
+        """
+        self._track_event(event_name, event_properties)
 
 
 # Global tracker instance
@@ -140,3 +201,30 @@ def get_tracker() -> MixpanelTracker:
 
 def track_code_loader_loaded(event_properties: Optional[Dict[str, Any]] = None) -> None:
     get_tracker().track_code_loader_loaded(event_properties)
+
+
+def track_integration_test_event(event_name: Union[str, AnalyticsEvent], event_properties: Optional[Dict[str, Any]] = None) -> None:
+    get_tracker().track_integration_test_event(event_name, event_properties)
+
+
+# Module-level set to track which integration test events have been emitted
+_integration_events_emitted: Set[str] = set()
+
+
+def emit_integration_event_once(event_name: Union[str, AnalyticsEvent], props: Dict[str, Any]) -> None:
+    """Emit an integration test event only once per test run."""
+    event_name_str = str(event_name)
+    if event_name_str in _integration_events_emitted:
+        return
+    
+    try:
+        track_integration_test_event(event_name, props)
+        _integration_events_emitted.add(event_name_str)
+    except Exception as e:
+        logger.debug(f"Failed to emit integration event once '{event_name}': {e}")
+
+
+def clear_integration_events() -> None:
+    """Clear the integration events set for a new test run."""
+    global _integration_events_emitted
+    _integration_events_emitted.clear()

{code_loader-1.0.143 → code_loader-1.0.143.dev3}/code_loader/plot_functions/plot_functions.py

@@ -324,7 +324,7 @@ def plot_image_mask(leap_data: LeapImageMask, title: str) -> None:
 
         # fill the instance mask with a translucent color
         overlayed_image[instance_mask] = (
-                overlayed_image[instance_mask] * (1 - 0.5) + np.array(colors[i][:image.shape[-1]], dtype=np.uint8) * 0.5)
+                overlayed_image[instance_mask] * (1 - 0.5) + np.array(colors[i][:image.shape[-1]], dtype=image.dtype) * 0.5)
 
     # Display the result using matplotlib
     fig, ax = plt.subplots(1)

{code_loader-1.0.143 → code_loader-1.0.143.dev3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "code-loader"
-version = "1.0.143"
+version = "1.0.143.dev3"
 description = ""
 authors = ["dorhar <doron.harnoy@tensorleap.ai>"]
 license = "MIT"
@@ -22,7 +22,7 @@ requests = "^2.32.3"
 pyyaml = "^6.0.2"
 mixpanel = "^4.10.0"
 
-[tool.poetry.dev-dependencies]
+[tool.poetry.group.dev.dependencies]
 pytest = "^7.1.1"
 grappa = "^1.0.1"
 pytest-cov = "^3.0.0"