mbuzz 0.1.0__py3-none-any.whl → 0.2.0__py3-none-any.whl

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/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/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/middleware/flask.py

@@ -8,6 +8,7 @@ from ..config import config
 from ..context import RequestContext, set_context, clear_context
 from ..cookies import VISITOR_COOKIE, SESSION_COOKIE, VISITOR_MAX_AGE, SESSION_MAX_AGE
 from ..utils.identifier import generate_id
+from ..utils.session_id import generate_deterministic, generate_from_fingerprint
 from ..client.session import create_session
 
 
@@ -55,8 +56,29 @@ def _get_or_create_visitor_id() -> str:
 
 
 def _get_or_create_session_id() -> str:
-    """Get session ID from cookie or generate new one."""
-    return request.cookies.get(SESSION_COOKIE) or generate_id()
+    """Get session ID from cookie or generate deterministic one."""
+    existing = request.cookies.get(SESSION_COOKIE)
+    if existing:
+        return existing
+
+    existing_visitor_id = request.cookies.get(VISITOR_COOKIE)
+    if existing_visitor_id:
+        return generate_deterministic(existing_visitor_id)
+    else:
+        return generate_from_fingerprint(_get_client_ip(), _get_user_agent())
+
+
+def _get_client_ip() -> str:
+    """Get client IP from request headers."""
+    forwarded = request.headers.get("X-Forwarded-For", "")
+    if forwarded:
+        return forwarded.split(",")[0].strip()
+    return request.remote_addr or "unknown"
+
+
+def _get_user_agent() -> str:
+    """Get user agent from request."""
+    return request.headers.get("User-Agent", "unknown")
 
 
 def _set_request_context(visitor_id: str, session_id: str) -> None:

mbuzz/utils/session_id.py

@@ -0,0 +1,39 @@
+"""Deterministic session ID generation."""
+
+import hashlib
+import secrets
+import time
+
+SESSION_TIMEOUT_SECONDS = 1800
+SESSION_ID_LENGTH = 64
+FINGERPRINT_LENGTH = 32
+
+
+def generate_deterministic(visitor_id: str, timestamp: int | None = None) -> str:
+    """Generate session ID for returning visitors."""
+    if timestamp is None:
+        timestamp = int(time.time())
+    time_bucket = timestamp // SESSION_TIMEOUT_SECONDS
+    raw = f"{visitor_id}_{time_bucket}"
+    return hashlib.sha256(raw.encode()).hexdigest()[:SESSION_ID_LENGTH]
+
+
+def generate_from_fingerprint(
+    client_ip: str,
+    user_agent: str,
+    timestamp: int | None = None
+) -> str:
+    """Generate session ID for new visitors using IP+UA fingerprint."""
+    if timestamp is None:
+        timestamp = int(time.time())
+    fingerprint = hashlib.sha256(
+        f"{client_ip}|{user_agent}".encode()
+    ).hexdigest()[:FINGERPRINT_LENGTH]
+    time_bucket = timestamp // SESSION_TIMEOUT_SECONDS
+    raw = f"{fingerprint}_{time_bucket}"
+    return hashlib.sha256(raw.encode()).hexdigest()[:SESSION_ID_LENGTH]
+
+
+def generate_random() -> str:
+    """Generate random session ID (fallback)."""
+    return secrets.token_hex(32)

{mbuzz-0.1.0.dist-info → mbuzz-0.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mbuzz
-Version: 0.1.0
+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.0.dist-info → mbuzz-0.2.0.dist-info}/RECORD

@@ -1,17 +1,18 @@
-mbuzz/__init__.py,sha256=zZls_Zf7HfuCFUYnsG2e2mkvDNCioX0togiHom8kyUg,2247
+mbuzz/__init__.py,sha256=ip9lSCsNe7T5k1qOfGs4pttoTNGx5Ws-Zf9fHoWXFPg,2247
 mbuzz/api.py,sha256=BITkW6TQEGmPA0OmYFFC611X6JWiY6C1dY-_wsKDT2U,2107
 mbuzz/config.py,sha256=u6v1WnMTgiqyDXHszlXw5hyNENgYRy7-z-IWKuYp0-o,2399
-mbuzz/context.py,sha256=l_mwJg9rcmJ0viz9xTFvI5JP8Imohv5o6EjduAnBCNw,1224
+mbuzz/context.py,sha256=mM9Hi8GnqTkAVCqB_VKGCXl7a5AFME4WTM-2DCIji_w,1290
 mbuzz/cookies.py,sha256=MCpMljQXaqJ2bhEtTv1aKR2fuqLfGBFofjPRayAQGpw,197
 mbuzz/client/__init__.py,sha256=oNOTpPKdt-b_VH_f848OQTbEEDFhlpbEjZ-WjKvh3JI,36
 mbuzz/client/conversion.py,sha256=Ua3ngFWmH6ekm3ZanNf5up_jV8t5nf788ipM1usvZoM,2346
 mbuzz/client/identify.py,sha256=duyd-OWdBo4w7-7Nv5X-GeG2IpMI-1G_kYwnDXup0FE,859
 mbuzz/client/session.py,sha256=mk8v892bvpeW-VNKFQYDsW442w881yfXBiM4sr9a0SU,835
-mbuzz/client/track.py,sha256=-leW3yJcg9Vm6dL7fLQvFwgUN-nZF-OmDRMeR_9Blz8,3725
+mbuzz/client/track.py,sha256=HWRYWDWJ_WW_k5IHtkAn4s_MmVwSVFxsxR76KG2h_Ps,4288
 mbuzz/middleware/__init__.py,sha256=gIjwTArToaQNB2NC0iPE_RcmzuHjH7-7jjd7_Dyq4Pw,37
-mbuzz/middleware/flask.py,sha256=dRn8rnOTSrd0w7GjwzjxFFFGuCe7J84MvaNGTT5w4_k,3453
+mbuzz/middleware/flask.py,sha256=s3U77A2986L-KvWUH9MmqSwJwQWzQTYlZPZXH-wzE9o,4182
 mbuzz/utils/__init__.py,sha256=-ejtRN6CTkV3D8uujDtAPDoMT0DAG-ULpWOF-Ae55dY,103
 mbuzz/utils/identifier.py,sha256=iAYmd4he2RTtTNlmszb6KQmD9McZbSMgZZdkMuoGOCE,174
-mbuzz-0.1.0.dist-info/METADATA,sha256=HvgtdBRMTA3QqdpOrlkMUqIMoeq5LKnYPUuNrnwF9Hs,1849
-mbuzz-0.1.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-mbuzz-0.1.0.dist-info/RECORD,,
+mbuzz/utils/session_id.py,sha256=3XJkzPg5iUIbRYzz5LThfS8WTAmlmtn60WZTA_TlVhk,1185
+mbuzz-0.2.0.dist-info/METADATA,sha256=3Z8snpq6fv0PmZUvSuAjsH1KaiZIpE9pRLVHTaw8cPE,1849
+mbuzz-0.2.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+mbuzz-0.2.0.dist-info/RECORD,,