assigned guid for cli user

Author: bboynton97

agentstack/telemetry.py

@@ -21,17 +21,22 @@
 # cool of you to allow telemetry <3
 #
 # - braelyn
+import json
 import os
 import platform
 import socket
+import uuid
+from pathlib import Path
 from typing import Optional
 import psutil
 import requests
 from agentstack import conf
 from agentstack.auth import get_stored_token
-from agentstack.utils import get_telemetry_opt_out, get_framework, get_version
+from agentstack.utils import get_telemetry_opt_out, get_framework, get_version, get_base_dir
 
-TELEMETRY_URL = 'https://api.agentstack.sh/telemetry'
+# TELEMETRY_URL = 'https://api.agentstack.sh/telemetry'
+TELEMETRY_URL = 'http://localhost:3000/telemetry'
+USER_GUID_FILE_PATH = get_base_dir() / ".cli-user-guid"
 
 
 def collect_machine_telemetry(command: str):
@@ -46,6 +51,7 @@ def collect_machine_telemetry(command: str):
         'cpu_count': psutil.cpu_count(logical=True),
         'memory': psutil.virtual_memory().total,
         'agentstack_version': get_version(),
+        'cli_user_id': _get_cli_user_guid()
     }
 
     if command != "init":
@@ -97,4 +103,25 @@ def update_telemetry(id: int, result: int, message: Optional[str] = None):
     try:
         requests.put(TELEMETRY_URL, json={"id": id, "result": result, "message": message})
     except Exception:
+        pass
+
+def _get_cli_user_guid() -> str:
+    if Path(USER_GUID_FILE_PATH).exists():
+        try:
+            with open(USER_GUID_FILE_PATH, 'r') as f:
+                return f.read()
+        except (json.JSONDecodeError, PermissionError):
+            return "unknown"
+
+    # make new cli user guid
+    try:
+        # Create directory if it doesn't exist
+        USER_GUID_FILE_PATH.parent.mkdir(parents=True, exist_ok=True)
+
+        guid = str(uuid.uuid4())
+        with open(USER_GUID_FILE_PATH, 'w') as f:
+            f.write(guid)
+        return guid
+    except (OSError, PermissionError):
+        # Silently fail in CI or when we can't write
         pass

agentstack/update.py

@@ -5,23 +5,8 @@
 from packaging.version import parse as parse_version, Version
 import inquirer
 from agentstack import log
-from agentstack.utils import term_color, get_version, get_framework
+from agentstack.utils import term_color, get_version, get_framework, get_base_dir
 from agentstack import packaging
-from appdirs import user_data_dir
-
-
-def _get_base_dir():
-    """Try to get appropriate directory for storing update file"""
-    try:
-        base_dir = Path(user_data_dir("agentstack", "agency"))
-        # Test if we can write to directory
-        test_file = base_dir / '.test_write_permission'
-        test_file.touch()
-        test_file.unlink()
-    except (RuntimeError, OSError, PermissionError):
-        # In CI or when directory is not writable, use temp directory
-        base_dir = Path(os.getenv('TEMP', '/tmp'))
-    return base_dir
 
 
 AGENTSTACK_PACKAGE = 'agentstack'
@@ -35,7 +20,8 @@ def _get_base_dir():
     'TEAMCITY_VERSION',
 ]
 
-LAST_CHECK_FILE_PATH = _get_base_dir() / ".cli-last-update"
+LAST_CHECK_FILE_PATH = get_base_dir() / ".cli-last-update"
+USER_GUID_FILE_PATH = get_base_dir() / ".cli-user-guid"
 INSTALL_PATH = Path(sys.executable).parent.parent
 ENDPOINT_URL = "https://pypi.org/simple"
 CHECK_EVERY = 3600  # hour

agentstack/utils.py

@@ -8,6 +8,7 @@
 import importlib.resources
 from agentstack import conf
 from inquirer import errors as inquirer_errors
+from appdirs import user_data_dir
 
 
 def get_version(package: str = 'agentstack'):
@@ -118,3 +119,16 @@ def validator(_, answer):
         return True
 
     return validator
+
+def get_base_dir():
+    """Try to get appropriate directory for storing update file"""
+    try:
+        base_dir = Path(user_data_dir("agentstack", "agency"))
+        # Test if we can write to directory
+        test_file = base_dir / '.test_write_permission'
+        test_file.touch()
+        test_file.unlink()
+    except (RuntimeError, OSError, PermissionError):
+        # In CI or when directory is not writable, use temp directory
+        base_dir = Path(os.getenv('TEMP', '/tmp'))
+    return base_dir