fleet-python 0.2.121__tar.gz → 0.2.123__tar.gz

{fleet_python-0.2.121/fleet_python.egg-info → fleet_python-0.2.123}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fleet-python
-Version: 0.2.121
+Version: 0.2.123
 Summary: Python SDK for Fleet environments
 Author-email: Fleet AI <nic@fleet.so>
 License: Apache-2.0

{fleet_python-0.2.121 → fleet_python-0.2.123}/fleet/__init__.py

@@ -73,7 +73,7 @@ from . import env
 from . import global_client as _global_client
 from ._async import global_client as _async_global_client
 
-__version__ = "0.2.120"
+__version__ = "0.2.122"
 
 __all__ = [
     # Core classes

{fleet_python-0.2.121 → fleet_python-0.2.123}/fleet/_async/__init__.py

@@ -44,7 +44,7 @@ from ..types import VerifierFunction
 from .. import env
 from . import global_client as _async_global_client
 
-__version__ = "0.2.120"
+__version__ = "0.2.122"
 
 __all__ = [
     # Core classes

{fleet_python-0.2.121 → fleet_python-0.2.123}/fleet/_async/base.py

@@ -26,7 +26,7 @@ from .exceptions import (
 try:
     from .. import __version__
 except ImportError:
-    __version__ = "0.2.120"
+    __version__ = "0.2.122"
 
 logger = logging.getLogger(__name__)
 

{fleet_python-0.2.121 → fleet_python-0.2.123}/fleet/base.py

@@ -27,7 +27,7 @@ from .exceptions import (
 try:
     from . import __version__
 except ImportError:
-    __version__ = "0.2.120"
+    __version__ = "0.2.122"
 
 logger = logging.getLogger(__name__)
 

{fleet_python-0.2.121 → fleet_python-0.2.123}/fleet/track/cli.py

@@ -10,6 +10,7 @@ import typer
 from rich.console import Console
 from rich.table import Table
 
+from ..auth import load_credentials
 from .api import TrackAPIClient, TrackAPIError
 from .daemon import main as daemon_main
 from .install import install, is_installed, uninstall
@@ -55,10 +56,16 @@ def enable() -> None:
     try:
         api = TrackAPIClient()
         result = api.provision(device_id)
-        config["s3_prefix"] = result.get("s3_prefix", "")
-        config["s3_bucket"] = result.get("s3_bucket", "fleet-track-sessions")
         config["team_id"] = result.get("team_id", "")
         config["user_id"] = result.get("user_id", "")
+        # Pull email + team_name from stored credentials so the daemon can
+        # embed them in manifest.json for device → user association.
+        creds = load_credentials() or {}
+        config["email"] = creds.get("email", "")
+        config["team_name"] = creds.get("team_name", "")
+        import platform, socket
+        config["hostname"] = socket.gethostname()
+        config["platform"] = platform.system().lower()
         CONFIG_FILE.write_text(json.dumps(config, indent=2))
     except TrackAPIError as e:
         console.print(f"[red]Provision failed:[/red] {e}")

{fleet_python-0.2.121 → fleet_python-0.2.123}/fleet/track/daemon.py

@@ -92,6 +92,7 @@ class Daemon:
         self._bytes_uploaded = 0
         self._run_id = str(uuid.uuid4())[:8]
         self._device_id: str = ""
+        self._identity: dict = {}
         # confirmed_map: path → sha256 for every file we KNOW is on S3.
         # Populated from the remote manifest at startup and updated only on
         # successful upload callbacks. Used to build an honest manifest.json.
@@ -108,6 +109,15 @@ class Daemon:
         write_pid()
         cfg = _load_config()
         self._device_id = cfg["device_id"]
+        self._identity = {
+            "user_id": cfg.get("user_id", ""),
+            "email": cfg.get("email", ""),
+            "team_id": cfg.get("team_id", ""),
+            "team_name": cfg.get("team_name", ""),
+            "device_id": self._device_id,
+            "hostname": cfg.get("hostname", ""),
+            "platform": cfg.get("platform", ""),
+        }
         log.info("daemon starting run_id=%s pid=%s device=%s", self._run_id, os.getpid(), self._device_id)
 
         signal.signal(signal.SIGTERM, self._handle_sigterm)
@@ -247,7 +257,11 @@ class Daemon:
             confirmed = dict(self._confirmed_map)
 
         root = MerkleTree.compute_root(confirmed)
-        manifest = json.dumps({"root_hash": root, "files": confirmed}, separators=(",", ":"))
+        manifest = json.dumps({
+            "root_hash": root,
+            **self._identity,
+            "files": confirmed,
+        }, separators=(",", ":"))
         try:
             url_map = self._api.get_upload_urls(self._device_id, ["manifest.json"])
             url = url_map.get("manifest.json")

{fleet_python-0.2.121 → fleet_python-0.2.123}/fleet/track/queue.py

@@ -141,6 +141,20 @@ class UploadQueue:
                 "UPDATE queue SET status = 'done', updated_at = ? WHERE path = ? AND sha256 = ?",
                 (now, path, sha256),
             )
+            # Prune rows for the same path that were enqueued *before* this one —
+            # they are older versions superseded by this upload.
+            # Rows enqueued *after* (newer file content) are preserved so they
+            # upload without waiting for the next reconcile.
+            self._conn.execute(
+                """
+                DELETE FROM queue
+                WHERE path = ? AND sha256 != ? AND status IN ('failed', 'pending')
+                  AND enqueued_at <= (
+                      SELECT enqueued_at FROM queue WHERE path = ? AND sha256 = ?
+                  )
+                """,
+                (path, sha256, path, sha256),
+            )
             self._conn.commit()
 
     def mark_failed(self, path: str, sha256: str, error: str) -> None:

{fleet_python-0.2.121 → fleet_python-0.2.123}/fleet/track/uploader.py

@@ -19,7 +19,9 @@ from .scrubber import scrub_bytes
 log = logging.getLogger("fleet.track.uploader")
 
 WORKERS = 8
-UPLOAD_TIMEOUT_SECS = 120
+# Per-phase timeouts: connect/read can be short, write needs to be generous
+# for large JSONL files on slow connections.
+UPLOAD_TIMEOUT = httpx.Timeout(connect=10.0, read=30.0, write=300.0, pool=10.0)
 
 
 def _read_safe(path: Path) -> Optional[bytes]:
@@ -55,7 +57,7 @@ def upload_one(path: Path, presigned_url: str) -> bool:
             presigned_url,
             content=scrubbed,
             headers={"Content-Type": "application/octet-stream"},
-            timeout=UPLOAD_TIMEOUT_SECS,
+            timeout=UPLOAD_TIMEOUT,
         )
         if resp.status_code not in (200, 204):
             log.warning("upload %s → HTTP %s", path.name, resp.status_code)

{fleet_python-0.2.121 → fleet_python-0.2.123/fleet_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fleet-python
-Version: 0.2.121
+Version: 0.2.123
 Summary: Python SDK for Fleet environments
 Author-email: Fleet AI <nic@fleet.so>
 License: Apache-2.0

{fleet_python-0.2.121 → fleet_python-0.2.123}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "fleet-python"
 
-version = "0.2.121"
+version = "0.2.123"
 description = "Python SDK for Fleet environments"
 authors = [
     {name = "Fleet AI", email = "nic@fleet.so"},