scruby 2.4.0__py3-none-any.whl → 2.4.2__py3-none-any.whl

scruby/cache.py

@@ -12,7 +12,6 @@ from typing import Any, ClassVar, Literal, Never, assert_never, final
 import orjson
 
 from scruby.config import ScrubyConfig
-from scruby.meta import Metadata
 
 
 @final
@@ -59,20 +58,18 @@ class DocCache:
     @classmethod
     def load_cache(cls, subclasses: list[Any]) -> None:
         """Load all documents from the database into the cache."""
-        db_root: Path = Path(ScrubyConfig.db_root)
         HASH_REDUCE_LEFT: Literal[7, 6, 5, 0] = ScrubyConfig.HASH_REDUCE_LEFT
+
+        if HASH_REDUCE_LEFT == 0:
+            return
+
+        db_root: Path = Path(ScrubyConfig.db_root)
         MAX_NUMBER_BRANCH: Literal[16, 256, 4096, 4294967296] = ScrubyConfig.MAX_NUMBER_BRANCH
         branch_numbers: range = range(MAX_NUMBER_BRANCH)
 
         for subclass in subclasses:
             collection_name: str = subclass.__name__
 
-            # Create metadata for the collection if it is missing
-            Metadata.create(collection_name)
-
-            if HASH_REDUCE_LEFT == 0:
-                continue
-
             # Create a cache structure for the collection
             cls.create_structure(collection_name)
 

scruby/db.py

@@ -20,7 +20,7 @@ from xloft import NamedTuple
 from scruby import mixins
 from scruby.cache import DocCache
 from scruby.config import ScrubyConfig
-from scruby.meta import Meta
+from scruby.meta import Meta, Metadata
 from scruby.migration import Migration
 from scruby.model import ScrubyModel
 
@@ -210,4 +210,14 @@ class Scruby(
         ScrubyConfig.init_params()
         ScrubyConfig.check_hash_reduce_left()
         Migration.run(db_root, subclasses)
+
+        max_number_branch = ScrubyConfig.MAX_NUMBER_BRANCH
+        for subclass in subclasses:
+            Metadata.create(
+                db_root,
+                hash_reduce_left,
+                max_number_branch,
+                subclass.__name__,
+            )
+
         DocCache.load_cache(subclasses)

scruby/meta.py

@@ -14,8 +14,6 @@ from pathlib import Path
 
 from pydantic import BaseModel
 
-from scruby.config import ScrubyConfig
-
 
 class Meta(BaseModel):
     """Structure of metadata for collection."""
@@ -30,17 +28,15 @@ class Metadata:
     """Metadata management."""
 
     @staticmethod
-    def create(collection_name: str) -> None:
-        """Create metadata for collection.
-
-        Args:
-            collection_name (str): Collection name.
-
-        Returns:
-            None.
-        """
+    def create(
+        db_root: Path | str,
+        hash_reduce_left: int,
+        max_number_branch: int,
+        collection_name: str,
+    ) -> None:
+        """Create metadata for collections."""
         meta_dir_path = Path(
-            ScrubyConfig.db_root,
+            db_root,
             collection_name,
             "meta",
         )
@@ -48,8 +44,8 @@ class Metadata:
             meta_dir_path.mkdir(parents=True)
             meta = Meta(
                 collection_name=collection_name,
-                hash_reduce_left=ScrubyConfig.HASH_REDUCE_LEFT,
-                max_number_branch=ScrubyConfig.MAX_NUMBER_BRANCH,
+                hash_reduce_left=hash_reduce_left,
+                max_number_branch=max_number_branch,
                 counter_documents=0,
             )
             meta_json = meta.model_dump_json()

scruby/migration.py

@@ -19,6 +19,8 @@ class Migration:
         """Run migration."""
         # Delete collections whose models have been deleted
         cls.delete_orphan_collections(db_root, subclasses)
+        # Add collection directories if they are missing
+        cls.add_collection_directories(db_root, subclasses)
 
     @staticmethod
     def delete_orphan_collections(db_root: Path | str, subclasses: list[Any]) -> None:
@@ -31,3 +33,12 @@ class Migration:
                 if collection_name not in model_collection_list:
                     target_directory = Path(db_root, collection_name)
                     rmtree(target_directory)
+
+    @staticmethod
+    def add_collection_directories(db_root: Path | str, subclasses: list[Any]) -> None:
+        """Add collection directories if they are missing."""
+        for subclass in subclasses:
+            collection_name = subclass.__name__
+            coll_dir_path = Path(db_root, collection_name)
+            if not coll_dir_path.exists():
+                coll_dir_path.mkdir(parents=True)

scruby/mixins/collection.py

@@ -47,14 +47,24 @@ class Collection:
         Returns:
             None.
         """
+        db_root = ScrubyConfig.db_root
+        hash_reduce_left = ScrubyConfig.HASH_REDUCE_LEFT
+        max_number_branch = ScrubyConfig.MAX_NUMBER_BRANCH
+
         # Delete collection on file system
-        target_directory = f"{ScrubyConfig.db_root}/{collection_name}"
+        target_directory = f"{db_root}/{collection_name}"
         rmtree(target_directory)
-        # Create collection and metadata
-        Metadata.create(collection_name)
+
+        # Create a directory for the collection and add metadata
+        Metadata.create(
+            db_root,
+            hash_reduce_left,
+            max_number_branch,
+            collection_name,
+        )
 
         # Clear collection in cache
-        if ScrubyConfig.HASH_REDUCE_LEFT != 0:
+        if hash_reduce_left != 0:
             del DocCache.cache[collection_name]
             DocCache.create_structure(collection_name)
         return

{scruby-2.4.0.dist-info → scruby-2.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scruby
-Version: 2.4.0
+Version: 2.4.2
 Summary: Asynchronous library for building and managing a hybrid database, by scheme of key-value.
 Project-URL: Bug Tracker, https://github.com/kebasyaty/scruby/issues
 Project-URL: Changelog, https://github.com/kebasyaty/scruby/blob/v2/CHANGELOG.md
@@ -43,7 +43,7 @@ Description-Content-Type: text/markdown
       <img
         width="100%"
         alt="Logo"
-        src="https://raw.githubusercontent.com/kebasyaty/scruby/v2/assets/logo.jpg">
+        src="https://raw.githubusercontent.com/kebasyaty/scruby/v2/assets/logo.png">
     </a>
   </p>
   <p>
@@ -164,7 +164,7 @@ async def main() -> None:
     # Activate database.
     Scruby.run()
 
-    # Get/Create a User collection
+    # Get access to the collection
     user_coll = Scruby(User)
 
     # Create user
@@ -247,7 +247,7 @@ async def main() -> None:
     # Activate database.
     Scruby.run()
 
-    # Get/Create a Phone collection
+    # Get access to the collection
     phone_coll = Scruby(Phone)
 
     # Create phone
@@ -324,7 +324,7 @@ async def main() -> None:
     # Activate database.
     Scruby.run()
 
-    # Get/Create a Car collection
+    # Get access to the collection
     car_coll = Scruby(Car)
 
     # Create cars

{scruby-2.4.0.dist-info → scruby-2.4.2.dist-info}/RECORD

@@ -1,24 +1,24 @@
 scruby/__init__.py,sha256=deNLNpHBxrXFFRtIp6JakcyeaOuedFN1MiPTsXKLAis,1368
 scruby/aggregation.py,sha256=NBFxQqyRqUG2KIuD9fbl4uzSHJWTaskjiZ1YNBa-Zbo,3575
-scruby/cache.py,sha256=j_uRBF72p7kzUK6GMHIIqb8nM2RneCod45dbbI1KTjQ,4018
+scruby/cache.py,sha256=DRcTdQbh1DhTQDGK5oC_mZrjcQg6g06vJ1e61RfNX94,3864
 scruby/config.py,sha256=oyBEOzmKy9vka23ZDvP8Jqu-HMYn8HCmJ0j2TfOs-0w,5127
-scruby/db.py,sha256=ZhPoW0O1SYPhTqFTKc0GOQZjn6Lii3HOUHcfRPlP_eM,7189
+scruby/db.py,sha256=Kmb1Zo7IVfajjeHLCgj4clm0U2iRTggu5oiCXnnqDzk,7468
 scruby/errors.py,sha256=lTWiHzyO5Es9Nkf7quODJjONGn6ifcL95qlpA4epQQM,1386
-scruby/meta.py,sha256=dfr8q3TWhVcEl-lZuH5yd9rbO9vAPBhXBO3VYCNcOWo,1283
-scruby/migration.py,sha256=SkbiSrSIqspQZTEXvg-yqWz5CLBvtnuwfl8G7flOS0Q,1083
+scruby/meta.py,sha256=W6ikKkGItR63ZAY1HclCcUqs8JdVkeoubJt0wkU5vEM,1200
+scruby/migration.py,sha256=ZMKf64OaTkmMXgkFrz-XQlPrb5ghVps0N6lFrXSYQYA,1605
 scruby/model.py,sha256=1infUd1G-zxj5Z93mNOp1Wi2anD6TKDgu5Y0KEVcH2k,292
 scruby/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scruby/utils.py,sha256=l-UNz_DEuYEx6vS8ExgFGzbueQ6RwencClZQUr3VReo,2437
 scruby/mixins/__init__.py,sha256=nT79e80zXliuTGhR9CFosI2-3PQUCKwXbR7wPiFwgrU,669
-scruby/mixins/collection.py,sha256=lnwViHrJFrammQhJFGX_zicdr008-6GNcRI09JpXR-c,1759
+scruby/mixins/collection.py,sha256=QAvsRBYQvSnmBF1zDPA0NoXRl-PS0Qdy97MRfg1O6SU,2019
 scruby/mixins/count.py,sha256=CGpyOpsG25uC5utI2ByNxq2iTbJocj6w5tXrC1_cP40,2561
 scruby/mixins/custom_task.py,sha256=DIry4gBlTdaqZqymar-RrHSdhEiC2tn2pl9jmbk56zw,1547
 scruby/mixins/delete.py,sha256=InKVIud_ZYx9-CchUz_IygQDXMynNi4jQ0HKYeHC_R8,4328
 scruby/mixins/find.py,sha256=oEZRE6RqIBdwvNr8iSYyod8hI6ibi_egJP0pyXmJiss,9169
 scruby/mixins/keys.py,sha256=MvBy_8fQGROaQATK2qse2V8wR-xodPQG0KKZ2PK_t9U,10790
 scruby/mixins/update.py,sha256=TyxvxB-gNijlfzTmhwrq0ydvu0C3R-RihW5h5tJ96bM,4964
-scruby-2.4.0.dist-info/METADATA,sha256=p0EangsFZxQS9z8t3rOiDHYK6Umik7p4abH5z9UlW64,13431
-scruby-2.4.0.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
-scruby-2.4.0.dist-info/licenses/GPL-3.0-LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-scruby-2.4.0.dist-info/licenses/MIT-LICENSE,sha256=mS0Wz0yGNB63gEcWEnuIb_lldDYV0sjRaO-o_GL6CWE,1074
-scruby-2.4.0.dist-info/RECORD,,
+scruby-2.4.2.dist-info/METADATA,sha256=1ch9wQHuYPAF52xP8lRxnRh66vxLm-JjdXU7nfhfdTw,13431
+scruby-2.4.2.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
+scruby-2.4.2.dist-info/licenses/GPL-3.0-LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+scruby-2.4.2.dist-info/licenses/MIT-LICENSE,sha256=mS0Wz0yGNB63gEcWEnuIb_lldDYV0sjRaO-o_GL6CWE,1074
+scruby-2.4.2.dist-info/RECORD,,