cafs-cache-cdn-client 1.0.6__tar.gz → 1.0.8__tar.gz

{cafs_cache_cdn_client-1.0.6 → cafs_cache_cdn_client-1.0.8}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.3
 Name: cafs-cache-cdn-client
-Version: 1.0.6
+Version: 1.0.8
 Summary: Async Cache CDN client implementation
 Keywords: cafs,cache
 Author: Konstantin Belov
 Author-email: k.belov@gaijin.team
 Requires-Python: >=3.11,<4.0
 Classifier: License :: OSI Approved :: MIT License
-Classifier: Development Status :: 5 - Production/Stable
+Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
@@ -38,7 +38,7 @@ pip install cafs-cache-cdn-client
 import asyncio
 import logging
 from pathlib import Path
-from cafs_cache_cdn_client import CacheCdnClient
+from cafs_cache_cdn_client import CacheCdnClient, CompressionT
 
 # Configure logging to see detailed operation information
 logging.basicConfig(level=logging.DEBUG)
@@ -54,10 +54,11 @@ async def main():
 
     # Use as an async context manager to ensure proper resource cleanup
     async with client:
-        # Push a local directory to cache with a 2-hour TTL
+        # Push a local directory to cache with a 2-hour TTL and preferred ZSTD compression
         await client.push('project_name', 'build_artifacts',
                           '/path/to/build/output', ttl_hours=2,
-                          comment='Build artifacts from CI run #123')
+                          comment='Build artifacts from CI run #123',
+                          compression=CompressionT.ZSTD)
 
         # Check if a reference exists
         exists = await client.check('project_name', 'build_artifacts')
@@ -90,7 +91,7 @@ if __name__ == '__main__':
     - `connection_per_cafs_server`: Number of concurrent connections per CAFS server
 
 - **Methods**:
-    - `push(repo: str, ref: str, directory: Path | str, ttl_hours: int = 0, comment: str | None = None)` - Push a local directory to cache
+    - `push(repo: str, ref: str, directory: Path | str, ttl_hours: int = 0, comment: str | None = None, compression: CompressionT = CompressionT.NONE)` - Push a local directory to cache
     - `pull(repo: str, ref: str, directory: Path | str)` - Pull cached content to a local directory
     - `check(repo: str, ref: str) -> bool` - Check if a reference exists
     - `tag(repo: str, ref: str, tag: str)` - Create a tag for a reference

{cafs_cache_cdn_client-1.0.6 → cafs_cache_cdn_client-1.0.8}/README.md

@@ -18,7 +18,7 @@ pip install cafs-cache-cdn-client
 import asyncio
 import logging
 from pathlib import Path
-from cafs_cache_cdn_client import CacheCdnClient
+from cafs_cache_cdn_client import CacheCdnClient, CompressionT
 
 # Configure logging to see detailed operation information
 logging.basicConfig(level=logging.DEBUG)
@@ -34,10 +34,11 @@ async def main():
 
     # Use as an async context manager to ensure proper resource cleanup
     async with client:
-        # Push a local directory to cache with a 2-hour TTL
+        # Push a local directory to cache with a 2-hour TTL and preferred ZSTD compression
         await client.push('project_name', 'build_artifacts',
                           '/path/to/build/output', ttl_hours=2,
-                          comment='Build artifacts from CI run #123')
+                          comment='Build artifacts from CI run #123',
+                          compression=CompressionT.ZSTD)
 
         # Check if a reference exists
         exists = await client.check('project_name', 'build_artifacts')
@@ -70,7 +71,7 @@ if __name__ == '__main__':
     - `connection_per_cafs_server`: Number of concurrent connections per CAFS server
 
 - **Methods**:
-    - `push(repo: str, ref: str, directory: Path | str, ttl_hours: int = 0, comment: str | None = None)` - Push a local directory to cache
+    - `push(repo: str, ref: str, directory: Path | str, ttl_hours: int = 0, comment: str | None = None, compression: CompressionT = CompressionT.NONE)` - Push a local directory to cache
     - `pull(repo: str, ref: str, directory: Path | str)` - Pull cached content to a local directory
     - `check(repo: str, ref: str) -> bool` - Check if a reference exists
     - `tag(repo: str, ref: str, tag: str)` - Create a tag for a reference

{cafs_cache_cdn_client-1.0.6 → cafs_cache_cdn_client-1.0.8}/cafs_cache_cdn_client/__init__.py

@@ -1 +1,2 @@
+from .cafs import CompressionT
 from .client import CacheCdnClient

{cafs_cache_cdn_client-1.0.6 → cafs_cache_cdn_client-1.0.8}/cafs_cache_cdn_client/cafs/blob/utils.py

@@ -28,6 +28,9 @@ def is_file_already_compressed(file_path: Path) -> bool:
 def choose_compression(
     file_path: Path, preferred_compression: CompressionT = CompressionT.NONE
 ) -> CompressionT:
+    if preferred_compression == CompressionT.NONE:
+        return preferred_compression
+
     if file_path.stat().st_size < MINIMAL_COMPRESSION_SIZE:
         return CompressionT.NONE
 

{cafs_cache_cdn_client-1.0.6 → cafs_cache_cdn_client-1.0.8}/cafs_cache_cdn_client/cafs/client.py

@@ -1,5 +1,4 @@
 import asyncio
-from asyncio import Queue, QueueShutDown
 from collections.abc import (
     AsyncIterator,
     Callable,
@@ -282,7 +281,8 @@ class ConnectionPool:
 
     _lock: asyncio.Lock
     _connections: set[CAFSConnection]
-    _connection_queue: Queue[CAFSConnection]
+    _connection_queue: asyncio.Queue[CAFSConnection]
+    _close_event: asyncio.Event
 
     def __init__(
         self,
@@ -297,8 +297,9 @@ class ConnectionPool:
         self.connection_per_server = connection_per_server
 
         self._connections = set()
-        self._connection_queue = Queue()
+        self._connection_queue = asyncio.Queue()
         self._lock = asyncio.Lock()
+        self._close_event = asyncio.Event()
 
     async def get_connection_count(self) -> int:
         async with self._lock:
@@ -315,10 +316,21 @@ class ConnectionPool:
                 await self._connection_queue.put(conn)
 
     async def _get_connection(self) -> CAFSConnection:
-        try:
-            return await self._connection_queue.get()
-        except QueueShutDown as err:
-            raise EmptyConnectionPoolError() from err
+        if self._close_event.is_set():
+            raise EmptyConnectionPoolError()
+        get_task = asyncio.create_task(self._connection_queue.get())
+        close_task = asyncio.create_task(self._close_event.wait())
+        _, pending = await asyncio.wait(
+            [get_task, close_task], return_when=asyncio.FIRST_COMPLETED
+        )
+
+        for task in pending:
+            task.cancel()
+
+        if get_task in pending:
+            raise EmptyConnectionPoolError()
+
+        return get_task.result()
 
     async def _release_connection(self, conn: CAFSConnection) -> None:
         await self._connection_queue.put(conn)
@@ -328,14 +340,15 @@ class ConnectionPool:
         async with self._lock:
             self._connections.remove(conn)
             if not self._connections:
-                self._connection_queue.shutdown(immediate=True)
+                self._close_event.set()
 
     async def close(self) -> None:
         async with self._lock:
-            self._connection_queue.shutdown(immediate=True)
+            self._close_event.set()
             for conn in self._connections:
                 if conn.is_connected:
                     await conn.disconnect()
+            self._connections.clear()
 
     @asynccontextmanager
     async def connection(self) -> AsyncIterator[CAFSConnection]:
@@ -428,7 +441,6 @@ class CAFSClient:
         stop_event = asyncio.Event()
         workers = [asyncio.create_task(worker(stop_event)) for _ in range(len(blobs))]
         errors = await asyncio.gather(*workers, return_exceptions=True)
-        files_queue.shutdown(immediate=True)
 
         for err in errors:
             if isinstance(err, Exception):
@@ -508,7 +520,6 @@ class CAFSClient:
             asyncio.create_task(worker(stop_event)) for _ in range(max_concurrent)
         ]
         errors = await asyncio.gather(*workers, return_exceptions=True)
-        files_queue.shutdown(immediate=True)
 
         for err in errors:
             if isinstance(err, Exception):

{cafs_cache_cdn_client-1.0.6 → cafs_cache_cdn_client-1.0.8}/cafs_cache_cdn_client/client.py

@@ -7,7 +7,7 @@ from typing import Any, Self, TypeVar
 
 import aiofiles.os as aio_os
 
-from cafs_cache_cdn_client.cafs import CAFSClient
+from cafs_cache_cdn_client.cafs import CAFSClient, CompressionT
 from cafs_cache_cdn_client.file_utils import (
     LocalFile,
     compare_file_lists,
@@ -64,6 +64,7 @@ class CacheCdnClient:
         directory: Path | str,
         ttl_hours: int = 0,
         comment: str | None = None,
+        compression: CompressionT = CompressionT.NONE,
     ) -> None:
         if isinstance(directory, str):
             directory = Path(directory)
@@ -71,7 +72,8 @@ class CacheCdnClient:
             raise ValueError(f'{directory} is not a directory')
         files = walk(directory)
         hashes = await self._cafs_client.stream_batch(
-            [directory / file.path for file in files]
+            [directory / file.path for file in files],
+            compression=compression,
         )
         await self._repo_client.post_ref_info(
             repo,

{cafs_cache_cdn_client-1.0.6 → cafs_cache_cdn_client-1.0.8}/cafs_cache_cdn_client/file_utils.py

@@ -40,9 +40,10 @@ class LocalFile:
 
 def walk(directory: Path) -> list[LocalFile]:
     results = []
-    for root, _, files in directory.walk():
+    for root, _, files in os.walk(str(directory)):
+        root_ = Path(root)
         for file in files:
-            file_ = root / file
+            file_ = root_ / file
             file_stat = file_.stat()
             results.append(
                 LocalFile(

{cafs_cache_cdn_client-1.0.6 → cafs_cache_cdn_client-1.0.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cafs-cache-cdn-client"
-version = "1.0.6"
+version = "1.0.8"
 description = "Async Cache CDN client implementation"
 authors = [
     { name = "Konstantin Belov", "email" = "k.belov@gaijin.team" },
@@ -9,7 +9,7 @@ readme = "README.md"
 keywords = ["cafs", "cache"]
 classifiers = [
     "License :: OSI Approved :: MIT License",
-    "Development Status :: 5 - Production/Stable",
+    "Development Status :: 4 - Beta",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",