mbuzz 0.1.1__tar.gz → 0.2.0__tar.gz

{mbuzz-0.1.1 → mbuzz-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mbuzz
-Version: 0.1.1
+Version: 0.2.0
 Summary: Multi-touch attribution SDK for Python
 Project-URL: Homepage, https://mbuzz.co
 Project-URL: Documentation, https://mbuzz.co/docs/getting-started

{mbuzz-0.1.1 → mbuzz-0.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "mbuzz"
-version = "0.1.1"
+version = "0.2.0"
 description = "Multi-touch attribution SDK for Python"
 readme = "README.md"
 license = "MIT"

{mbuzz-0.1.1 → mbuzz-0.2.0}/src/mbuzz/__init__.py

@@ -8,7 +8,7 @@ from .client.track import track, TrackResult
 from .client.identify import identify
 from .client.conversion import conversion, ConversionResult
 
-__version__ = "0.1.0"
+__version__ = "0.2.0"
 
 
 def init(

{mbuzz-0.1.1 → mbuzz-0.2.0}/src/mbuzz/client/track.py

@@ -28,10 +28,12 @@ class TrackOptions:
     session_id: Optional[str] = None
     user_id: Optional[str] = None
     properties: Optional[Dict[str, Any]] = None
+    ip: Optional[str] = None
+    user_agent: Optional[str] = None
 
 
 def _resolve_ids(options: TrackOptions) -> TrackOptions:
-    """Resolve visitor/session/user IDs from context if not provided."""
+    """Resolve visitor/session/user IDs and ip/user_agent from context if not provided."""
     ctx = get_context()
     if not ctx:
         return options
@@ -42,6 +44,8 @@ def _resolve_ids(options: TrackOptions) -> TrackOptions:
         session_id=options.session_id or ctx.session_id,
         user_id=options.user_id or ctx.user_id,
         properties=options.properties,
+        ip=options.ip or ctx.ip,
+        user_agent=options.user_agent or ctx.user_agent,
     )
 
 
@@ -62,18 +66,21 @@ def _validate(options: TrackOptions) -> bool:
 
 def _build_payload(options: TrackOptions, properties: Dict[str, Any]) -> Dict[str, Any]:
     """Build API payload from options."""
-    return {
-        "events": [
-            {
-                "event_type": options.event_type,
-                "visitor_id": options.visitor_id,
-                "session_id": options.session_id,
-                "user_id": options.user_id,
-                "properties": properties,
-                "timestamp": datetime.now(timezone.utc).isoformat(),
-            }
-        ]
+    event = {
+        "event_type": options.event_type,
+        "visitor_id": options.visitor_id,
+        "session_id": options.session_id,
+        "user_id": options.user_id,
+        "properties": properties,
+        "timestamp": datetime.now(timezone.utc).isoformat(),
     }
+    # Add ip and user_agent only if provided (for server-side session resolution)
+    if options.ip:
+        event["ip"] = options.ip
+    if options.user_agent:
+        event["user_agent"] = options.user_agent
+
+    return {"events": [event]}
 
 
 def _parse_response(response: Optional[Dict[str, Any]], options: TrackOptions) -> TrackResult:
@@ -97,6 +104,8 @@ def track(
     session_id: Optional[str] = None,
     user_id: Optional[str] = None,
     properties: Optional[Dict[str, Any]] = None,
+    ip: Optional[str] = None,
+    user_agent: Optional[str] = None,
 ) -> TrackResult:
     """Track an event.
 
@@ -106,6 +115,8 @@ def track(
         session_id: Session ID (uses context if not provided)
         user_id: User ID (uses context if not provided)
         properties: Additional event properties
+        ip: Client IP address for server-side session resolution
+        user_agent: Client user agent for server-side session resolution
 
     Returns:
         TrackResult with success status and event details
@@ -116,6 +127,8 @@ def track(
         session_id=session_id,
         user_id=user_id,
         properties=properties,
+        ip=ip,
+        user_agent=user_agent,
     )
 
     options = _resolve_ids(options)

{mbuzz-0.1.1 → mbuzz-0.2.0}/src/mbuzz/context.py

@@ -14,6 +14,8 @@ class RequestContext:
     user_id: Optional[str] = None
     url: Optional[str] = None
     referrer: Optional[str] = None
+    ip: Optional[str] = None
+    user_agent: Optional[str] = None
 
     def enrich_properties(self, properties: Dict[str, Any]) -> Dict[str, Any]:
         """Add url and referrer to properties if not already present."""

{mbuzz-0.1.1 → mbuzz-0.2.0}/tests/test_client.py

@@ -112,6 +112,100 @@ class TestTrack:
         result = track(event_type="page_view", visitor_id="vid_123")
         assert result.success is False
 
+    # Server-side session resolution tests (v0.2.0+)
+
+    @patch("mbuzz.client.track.post_with_response")
+    def test_accepts_ip_parameter(self, mock_post):
+        """Should accept and forward ip parameter."""
+        mock_post.return_value = {"events": [{"id": "evt_123"}]}
+
+        result = track(
+            event_type="page_view",
+            visitor_id="vid_123",
+            ip="192.168.1.100"
+        )
+        assert result.success is True
+
+        call_args = mock_post.call_args[0]
+        payload = call_args[1]
+        assert payload["events"][0]["ip"] == "192.168.1.100"
+
+    @patch("mbuzz.client.track.post_with_response")
+    def test_accepts_user_agent_parameter(self, mock_post):
+        """Should accept and forward user_agent parameter."""
+        mock_post.return_value = {"events": [{"id": "evt_123"}]}
+
+        result = track(
+            event_type="page_view",
+            visitor_id="vid_123",
+            user_agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7)"
+        )
+        assert result.success is True
+
+        call_args = mock_post.call_args[0]
+        payload = call_args[1]
+        assert payload["events"][0]["user_agent"] == "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7)"
+
+    @patch("mbuzz.client.track.post_with_response")
+    def test_accepts_both_ip_and_user_agent(self, mock_post):
+        """Should accept both ip and user_agent parameters."""
+        mock_post.return_value = {"events": [{"id": "evt_123"}]}
+
+        result = track(
+            event_type="page_view",
+            visitor_id="vid_123",
+            ip="10.0.0.1",
+            user_agent="Chrome/120"
+        )
+        assert result.success is True
+
+        call_args = mock_post.call_args[0]
+        payload = call_args[1]
+        assert payload["events"][0]["ip"] == "10.0.0.1"
+        assert payload["events"][0]["user_agent"] == "Chrome/120"
+
+    @patch("mbuzz.client.track.post_with_response")
+    def test_uses_context_ip_and_user_agent(self, mock_post):
+        """Should use ip and user_agent from context if not explicitly provided."""
+        mock_post.return_value = {"events": [{"id": "evt_123"}]}
+        set_context(RequestContext(
+            visitor_id="ctx_vid",
+            session_id="ctx_sid",
+            ip="203.0.113.50",
+            user_agent="Safari/17.0"
+        ))
+
+        result = track(event_type="page_view")
+        assert result.success is True
+
+        call_args = mock_post.call_args[0]
+        payload = call_args[1]
+        assert payload["events"][0]["ip"] == "203.0.113.50"
+        assert payload["events"][0]["user_agent"] == "Safari/17.0"
+
+    @patch("mbuzz.client.track.post_with_response")
+    def test_explicit_ip_overrides_context(self, mock_post):
+        """Should use explicit ip/user_agent over context."""
+        mock_post.return_value = {"events": [{"id": "evt_123"}]}
+        set_context(RequestContext(
+            visitor_id="ctx_vid",
+            session_id="ctx_sid",
+            ip="context_ip",
+            user_agent="context_ua"
+        ))
+
+        result = track(
+            event_type="page_view",
+            ip="explicit_ip",
+            user_agent="explicit_ua"
+        )
+        assert result.success is True
+
+        call_args = mock_post.call_args[0]
+        payload = call_args[1]
+        assert payload["events"][0]["ip"] == "explicit_ip"
+        assert payload["events"][0]["user_agent"] == "explicit_ua"
+
 
 class TestIdentify:
     """Test identify function."""