kscale 0.1.0__tar.gz → 0.1.2__tar.gz

{kscale-0.1.0/kscale.egg-info → kscale-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: kscale
-Version: 0.1.0
+Version: 0.1.2
 Summary: The kscale project
 Home-page: https://github.com/kscalelabs/kscale
 Author: Benjamin Bolte
@@ -9,7 +9,6 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: omegaconf
 Requires-Dist: email_validator
-Requires-Dist: colorlogging
 Requires-Dist: aiohttp
 Requires-Dist: cryptography
 Requires-Dist: httpx
@@ -19,6 +18,7 @@ Requires-Dist: requests
 Requires-Dist: yarl
 Requires-Dist: aiofiles
 Requires-Dist: click
+Requires-Dist: colorlogging
 Requires-Dist: tabulate
 Requires-Dist: async-lru
 Requires-Dist: krec

{kscale-0.1.0 → kscale-0.1.2}/kscale/__init__.py

@@ -1,6 +1,6 @@
 """Defines the common interface for the K-Scale Python API."""
 
-__version__ = "0.1.0"
+__version__ = "0.1.2"
 
 from pathlib import Path
 

{kscale-0.1.0 → kscale-0.1.2}/kscale/conf.py

@@ -22,6 +22,7 @@ def get_path() -> Path:
 class WWWSettings:
     api_root: str = field(default=DEFAULT_API_ROOT)
     cache_dir: str = field(default=II("oc.env:KSCALE_CACHE_DIR,'~/.kscale/cache/'"))
+    refresh_interval_minutes: int = field(default=60 * 24)
 
 
 @dataclass

{kscale-0.1.0 → kscale-0.1.2}/kscale/web/clients/robot_class.py

@@ -1,6 +1,7 @@
 """Defines the client for interacting with the K-Scale robot class endpoints."""
 
 import hashlib
+import json
 import logging
 from pathlib import Path
 
@@ -8,10 +9,13 @@ import httpx
 
 from kscale.web.clients.base import BaseClient
 from kscale.web.gen.api import RobotClass, RobotDownloadURDFResponse, RobotUploadURDFResponse
-from kscale.web.utils import get_cache_dir
+from kscale.web.utils import get_cache_dir, should_refresh_file
 
 logger = logging.getLogger(__name__)
 
+UPLOAD_TIMEOUT = 300.0
+DOWNLOAD_TIMEOUT = 60.0
+
 
 class RobotClassClient(BaseClient):
     async def get_robot_classes(self) -> list[RobotClass]:
@@ -77,7 +81,9 @@ class RobotClassClient(BaseClient):
             auth=True,
         )
         response = RobotUploadURDFResponse.model_validate(data)
-        async with httpx.AsyncClient() as client:
+        async with httpx.AsyncClient(
+            timeout=httpx.Timeout(UPLOAD_TIMEOUT),
+        ) as client:
             async with client.stream(
                 "PUT",
                 response.url,
@@ -89,15 +95,26 @@ class RobotClassClient(BaseClient):
 
     async def download_robot_class_urdf(self, class_name: str, *, cache: bool = True) -> Path:
         cache_path = get_cache_dir() / class_name / "robot.tgz"
-        if cache and cache_path.exists():
+        if cache and cache_path.exists() and not should_refresh_file(cache_path):
             return cache_path
         data = await self._request("GET", f"/robots/urdf/{class_name}", auth=True)
         response = RobotDownloadURDFResponse.model_validate(data)
         expected_hash = response.md5_hash
         cache_path.parent.mkdir(parents=True, exist_ok=True)
 
+        # Checks the md5 hash of the file.
+        cache_path_info = cache_path.parent / "info.json"
+        if cache_path_info.exists():
+            with open(cache_path_info, "r") as f:
+                info = json.load(f)
+                if info["md5_hash"] == expected_hash:
+                    cache_path.touch()
+                    return cache_path
+
         logger.info("Downloading URDF file from %s", response.url)
-        async with httpx.AsyncClient() as client:
+        async with httpx.AsyncClient(
+            timeout=httpx.Timeout(DOWNLOAD_TIMEOUT),
+        ) as client:
             with open(cache_path, "wb") as file:
                 hash_value = hashlib.md5()
                 async with client.stream("GET", response.url) as r:
@@ -111,4 +128,10 @@ class RobotClassClient(BaseClient):
         if hash_value_hex != expected_hash:
             raise ValueError(f"MD5 hash mismatch: {hash_value_hex} != {expected_hash}")
 
+        # Updates the info file.
+        logger.info("Updating downloaded file information")
+        info = {"md5_hash": hash_value_hex}
+        with open(cache_path_info, "w") as f:
+            json.dump(info, f)
+
         return cache_path

{kscale-0.1.0 → kscale-0.1.2}/kscale/web/utils.py

@@ -2,6 +2,7 @@
 
 import functools
 import logging
+import time
 from pathlib import Path
 
 from kscale.conf import Settings
@@ -17,6 +18,11 @@ def get_cache_dir() -> Path:
     return Path(Settings.load().www.cache_dir).expanduser().resolve()
 
 
+def should_refresh_file(file: Path) -> bool:
+    """Returns whether the file should be refreshed."""
+    return file.exists() and file.stat().st_mtime < time.time() - Settings.load().www.refresh_interval_minutes * 60
+
+
 @functools.lru_cache
 def get_artifact_dir(artifact_id: str) -> Path:
     """Returns the directory for a specific artifact."""

{kscale-0.1.0 → kscale-0.1.2/kscale.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: kscale
-Version: 0.1.0
+Version: 0.1.2
 Summary: The kscale project
 Home-page: https://github.com/kscalelabs/kscale
 Author: Benjamin Bolte
@@ -9,7 +9,6 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: omegaconf
 Requires-Dist: email_validator
-Requires-Dist: colorlogging
 Requires-Dist: aiohttp
 Requires-Dist: cryptography
 Requires-Dist: httpx
@@ -19,6 +18,7 @@ Requires-Dist: requests
 Requires-Dist: yarl
 Requires-Dist: aiofiles
 Requires-Dist: click
+Requires-Dist: colorlogging
 Requires-Dist: tabulate
 Requires-Dist: async-lru
 Requires-Dist: krec

{kscale-0.1.0 → kscale-0.1.2}/kscale/requirements.txt

@@ -3,7 +3,6 @@
 # Configuration
 omegaconf
 email_validator
-colorlogging
 
 # HTTP requests
 aiohttp
@@ -17,6 +16,7 @@ yarl
 # CLI
 aiofiles
 click
+colorlogging
 tabulate
 
 # Async

{kscale-0.1.0 → kscale-0.1.2}/kscale.egg-info/requires.txt

@@ -1,6 +1,5 @@
 omegaconf
 email_validator
-colorlogging
 aiohttp
 cryptography
 httpx
@@ -10,6 +9,7 @@ requests
 yarl
 aiofiles
 click
+colorlogging
 tabulate
 async-lru
 krec