lfss 0.7.10__py3-none-any.whl → 0.7.11__py3-none-any.whl

lfss/cli/serve.py

@@ -24,7 +24,7 @@ def main():
         log_config=default_logging_config
     )
     server = Server(config=config)
-    logger.info(f"Starting server at {args.host}:{args.port}, with {args.workers} workers")
+    logger.info(f"Starting server at http://{args.host}:{args.port}, with {args.workers} workers.")
     server.run()
 
 if __name__ == "__main__":

lfss/cli/vacuum.py

@@ -2,8 +2,8 @@
 Vacuum the database and external storage to ensure that the storage is consistent and minimal.
 """
 
-from lfss.src.config import LARGE_BLOB_DIR, DATA_HOME
-import argparse, time, os
+from lfss.src.config import LARGE_BLOB_DIR
+import argparse, time
 from functools import wraps
 from asyncio import Semaphore
 import aiofiles, asyncio
@@ -11,6 +11,7 @@ import aiofiles.os
 from contextlib import contextmanager
 from lfss.src.database import transaction, unique_cursor
 from lfss.src.stat import RequestDB
+from lfss.src.utils import now_stamp
 from lfss.src.connection_pool import global_entrance
 
 sem: Semaphore
@@ -68,12 +69,9 @@ async def vacuum_main(index: bool = False, blobs: bool = False):
 
 async def vacuum_requests():
     with indicator("VACUUM-requests"):
-        req_db = await RequestDB().init()
-        try:
-            await req_db.shrink()
+        async with RequestDB().connect() as req_db:
+            await req_db.shrink(max_rows=1_000_000, time_before=now_stamp() - 7*24*60*60)
             await req_db.conn.execute("VACUUM")
-        finally:
-            await req_db.close()
             
 def main():
     global sem
@@ -81,7 +79,7 @@ def main():
     parser.add_argument("-j", "--jobs", type=int, default=2, help="Number of concurrent jobs")
     parser.add_argument("-m", "--metadata", action="store_true", help="Vacuum metadata")
     parser.add_argument("-d", "--data", action="store_true", help="Vacuum blobs")
-    parser.add_argument("-r", "--requests", action="store_true", help="Vacuum request logs")
+    parser.add_argument("-r", "--requests", action="store_true", help="Vacuum request logs to only keep at most recent 1M rows in 7 days")
     args = parser.parse_args()
     sem = Semaphore(args.jobs)
     asyncio.run(vacuum_main(index=args.metadata, blobs=args.data))

lfss/src/server.py

@@ -31,7 +31,6 @@ async def lifespan(app: FastAPI):
     try:
         await global_connection_init(n_read = 2)
         await asyncio.gather(db.init(), req_conn.init())
-        await req_conn.shrink()
         yield
         await req_conn.commit()
     finally:

lfss/src/stat.py

@@ -1,7 +1,8 @@
 from typing import Optional, Any
 import aiosqlite
+from contextlib import asynccontextmanager
 from .config import DATA_HOME
-from .utils import debounce_async, concurrent_wrap
+from .utils import debounce_async
 
 class RequestDB:
     conn: aiosqlite.Connection
@@ -26,6 +27,14 @@ class RequestDB:
             )
         ''')
         return self
+    
+    def connect(self):
+        @asynccontextmanager
+        async def _mgr():
+            await self.init()
+            yield self
+            await self.close()
+        return _mgr()
 
     async def close(self):
         await self.conn.close()
@@ -65,7 +74,6 @@ class RequestDB:
             assert cursor.lastrowid is not None
             return cursor.lastrowid
     
-    @concurrent_wrap()
     async def shrink(self, max_rows: int = 1_000_000, time_before: float = 0):
         async with aiosqlite.connect(self.db) as conn:
 

{lfss-0.7.10.dist-info → lfss-0.7.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lfss
-Version: 0.7.10
+Version: 0.7.11
 Summary: Lightweight file storage service
 Home-page: https://github.com/MenxLi/lfss
 Author: li, mengxun
@@ -15,6 +15,7 @@ Requires-Dist: aiofiles (==23.*)
 Requires-Dist: aiosqlite (==0.*)
 Requires-Dist: fastapi (==0.*)
 Requires-Dist: mimesniff (==1.*)
+Requires-Dist: uvicorn (==0.*)
 Project-URL: Repository, https://github.com/MenxLi/lfss
 Description-Content-Type: text/markdown
 

{lfss-0.7.10.dist-info → lfss-0.7.11.dist-info}/RECORD

@@ -13,9 +13,9 @@ frontend/utils.js,sha256=Ts4nlef8pkrEgpwX-uQwAhWvwxlIzex8ijDLNCa22ps,2372
 lfss/cli/balance.py,sha256=R2rbO2tg9TVnnQIVeU0GJVeMS-5LDhEdk4mbOE9qGq0,4121
 lfss/cli/cli.py,sha256=LH1nx5wI1K2DZ3hvHz7oq5HcXVDoW2V6sr7q9gJ8gqo,4621
 lfss/cli/panel.py,sha256=iGdVmdWYjA_7a78ZzWEB_3ggIOBeUKTzg6F5zLaB25c,1401
-lfss/cli/serve.py,sha256=bO3GT0kuylMGN-7bZWP4e71MlugGZ_lEMkYaYld_Ntg,985
+lfss/cli/serve.py,sha256=T-jz_PJcaY9FJRRfyWV9MbjDI73YdOOCn4Nr2PO-s0c,993
 lfss/cli/user.py,sha256=ETLtj0N-kmxv0mhmeAsO6cY7kPq7nOOP4DetxIRoQpQ,3405
-lfss/cli/vacuum.py,sha256=i7YufreIsl8J9qfHm876vCmo0wv9OnK-FwyRK0o6HNQ,3624
+lfss/cli/vacuum.py,sha256=4TMMYC_5yEt7jeaFTVC3iX0X6aUzYXBiCsrcIYgw_uA,3695
 lfss/client/__init__.py,sha256=8uvcKs3PYQamDd_cjfN-fX9QUohEzJqeJlOYkBlzC3M,4556
 lfss/client/api.py,sha256=kSkB4wADTu012-1wl6v90OiZrw6aTQ42GU4jtV4KO0k,5764
 lfss/sql/init.sql,sha256=C-JtQAlaOjESI8uoF1Y_9dKukEVSw5Ll-7yA3gG-XHU,1210
@@ -27,10 +27,10 @@ lfss/src/database.py,sha256=w2QPE3h1Lx0D0fUmdtu9s1XHpNp9p27zqm8AVeP2UVg,32476
 lfss/src/datatype.py,sha256=WfrLALU_7wei5-i_b0TxY8xWI5mwxLUHFepHSps49zA,1767
 lfss/src/error.py,sha256=imbhwnbhnI3HLhkbfICROe3F0gleKrOk4XnqHJDOtuI,285
 lfss/src/log.py,sha256=u6WRZZsE7iOx6_CV2NHh1ugea26p408FI4WstZh896A,5139
-lfss/src/server.py,sha256=WnUc116XnGooH78IQNkI7VO4bel-Xvp_ZzCoHTcu8sM,16288
-lfss/src/stat.py,sha256=sCSsrdkA0aX9fyNfZlNrZ8PVpovKYQKwWj2xKcCIXx4,3009
+lfss/src/server.py,sha256=pz5cAofW0Ge_xj9ceht5IEJ04bvFTgiwv0ESX6qHoJU,16256
+lfss/src/stat.py,sha256=Wr-ug_JqtbSIf3XwQnv1xheGhsDTEOlLWuYoKO_26Jo,3201
 lfss/src/utils.py,sha256=TBGYvgt6xMP8UC5wTGHAr9fmdhu0_gjOtxcSeyvGyVM,3918
-lfss-0.7.10.dist-info/METADATA,sha256=iKvhqHzMfLEqap1_iNt-UIYykPUAZKuCPJhR302AWpM,1968
-lfss-0.7.10.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-lfss-0.7.10.dist-info/entry_points.txt,sha256=VJ8svMz7RLtMCgNk99CElx7zo7M-N-z7BWDVw2HA92E,205
-lfss-0.7.10.dist-info/RECORD,,
+lfss-0.7.11.dist-info/METADATA,sha256=9GmBltFBPJ8jFEo2QtVd5FbSILGbKf4HECzm4orTolI,1999
+lfss-0.7.11.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+lfss-0.7.11.dist-info/entry_points.txt,sha256=VJ8svMz7RLtMCgNk99CElx7zo7M-N-z7BWDVw2HA92E,205
+lfss-0.7.11.dist-info/RECORD,,