Aws s3 storage (#10)

* rename .client() to .http_client to be consistent with async, and add s3 support

* mock s3 fully

Author: paultiq

.pre-commit-config.yaml

@@ -4,7 +4,7 @@ exclude: "^$"
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: check-added-large-files
   - repo: https://github.com/astral-sh/ruff-pre-commit

pyproject.toml

@@ -28,8 +28,7 @@ classifiers = [
 
 [dependency-groups]
 dev = [
-  "boto3>=1.40.6",
-  "moto>=5.1.9",
+  "hishel[s3]>=0.1.3",
   "pre-commit>=4.2.0",
   "pylint>=3.3.8",
   "pytest>=8.4.1",
@@ -213,4 +212,4 @@ requires = ["hatchling",
 build-backend = "hatchling.build"
 
 [tool.pytest.ini_options]
-asyncio_mode = "auto"
+asyncio_mode = "auto"

tests/test_s3.py

@@ -1,11 +1,30 @@
-import boto3
-from moto import mock_aws
 from httpxthrottlecache import HttpxThrottleCache
 import time
 import pytest
 import asyncio
+import io
+
+class s3_mock:
+    def __init__(self): 
+        self.store={}
+    def create_bucket(self, Bucket): 
+        ...
+    def put_object(self, Bucket, Key, Body, Metadata): 
+        self.store[(Bucket,Key)]={"Body":Body if isinstance(Body,bytes) else Body.encode(),"Metadata":Metadata}
+    def get_object(self, Bucket, Key): 
+        o=self.store[(Bucket,Key)]
+        return {"Body": io.BytesIO(o["Body"]), "Metadata": o["Metadata"]}
+    def head_object(self, Bucket, Key): 
+        return {"Metadata": self.store[(Bucket,Key)]["Metadata"]}
+    def list_objects(self, Bucket): 
+        return {"Contents":[{"Key": k[1]} for k in self.store.keys() if k[0]==Bucket]}
+    def delete_object(self, Bucket, Key): 
+        self.store.pop((Bucket,Key), None)
+
+class boto3():
+    def client(*args, **kwargs):
+        return s3_mock()
 
-@mock_aws
 def test_s3_sync():
     url = "https://httpbin.org/cache/60"
 
@@ -29,23 +48,22 @@ def test_s3_sync():
 
 @pytest.mark.asyncio
 async def test_s3_async():
-    with mock_aws():
-        url = "https://httpbin.org/cache/60"
+    url = "https://httpbin.org/cache/60"
 
-        s3 = boto3.client("s3", region_name="us-east-1")
-        s3.create_bucket(Bucket="mybucket")
+    s3 = boto3.client("s3", region_name="us-east-1")
+    s3.create_bucket(Bucket="mybucket")
 
-        mgr = HttpxThrottleCache(httpx_params={"headers": {}}, cache_enabled=True, s3_bucket="mybucket", s3_client=s3)
-        
-        async with mgr.async_http_client() as client:
-            response1 = await client.get(url=url)
+    mgr = HttpxThrottleCache(httpx_params={"headers": {}}, cache_enabled=True, s3_bucket="mybucket", s3_client=s3)
+    
+    async with mgr.async_http_client() as client:
+        response1 = await client.get(url=url)
 
-            assert response1.status_code == 200, response1.status_code 
-            
-            await asyncio.sleep(1.5)
-            
-            response2 = await client.get(url=url)
+        assert response1.status_code == 200, response1.status_code 
+        
+        await asyncio.sleep(1.5)
+        
+        response2 = await client.get(url=url)
 
-            assert response2.status_code == 200, response2.status_code 
+        assert response2.status_code == 200, response2.status_code 
 
-            assert response1.headers["date"] == response2.headers["date"]
+        assert response1.headers["date"] == response2.headers["date"]