scruby 2.1.2__py3-none-any.whl → 2.2.1__py3-none-any.whl

scruby/__init__.py

@@ -15,10 +15,10 @@
 The library uses fractal-tree addressing and
 the search for documents based on the effect of a quantum loop.
 
-The size of each collection is 4096 branches,
+The size of each collection is 16|256|4096|4294967296 branches,
 each branch can store one or more keys.
 
-The value of any key in collection can be obtained in 3 steps,
+The value of any key in collection can be obtained in 1-8 steps,
 thereby achieving high performance.
 
 The effectiveness of the search for documents based on a quantum loop,

scruby/config.py

@@ -6,8 +6,8 @@
 
 The settings class contains the following parameters:
 
-- `db_root` - Path to root directory of database. `Default = "ScrubyDB" (in root of project)`.
 - `db_id` - Database ID.
+- `db_root` - Path to root directory of database. `Default = "ScrubyDB" (in root of project)`.
 - `HASH_REDUCE_LEFT` - The length of the hash reduction on the left side.
     - `7` - 16 branches in collection (is default).
     - `6` - 256 branches in collection.
@@ -34,14 +34,14 @@ from scruby.utils import add_to_env, get_from_env
 class ScrubyConfig:
     """Database settings."""
 
-    # Path to root directory of database
-    # By default = "ScrubyDB" (in root of project).
-    db_root: ClassVar[str] = "ScrubyDB"
-
     # Database ID
     # Will be automatically assigned.
     db_id: ClassVar[str | None] = None
 
+    # Path to root directory of database
+    # By default = "ScrubyDB" (in root of project).
+    db_root: ClassVar[str] = "ScrubyDB"
+
     # The length of the hash reduction on the left side.
     # 7 = 16 branches in collection.
     # 6 = 256 branches in collection (is default).
@@ -134,3 +134,14 @@ class ScrubyConfig:
                 + f"is not equal to the primary value {hash_reduce_left}."
             )
             raise ValueError(msg)
+
+    @classmethod
+    def restore(cls) -> None:
+        """Restore default parameter values."""
+        cls.db_id = None
+        cls.db_root = "ScrubyDB"
+        cls.HASH_REDUCE_LEFT = 7
+        cls.MAX_NUMBER_BRANCH = 16
+        cls.max_workers = None
+        cls.plugins = None
+        cls.sys_platform = sys.platform

scruby/db.py

@@ -60,8 +60,8 @@ class Scruby(
     ) -> None:
         super().__init__()
         self._meta = _Meta
-        self._db_root = ScrubyConfig.db_root
         self._db_id = ScrubyConfig.db_id
+        self._db_root = ScrubyConfig.db_root
         self._hash_reduce_left = ScrubyConfig.HASH_REDUCE_LEFT
         self._max_number_branch = ScrubyConfig.MAX_NUMBER_BRANCH
         self._max_workers = ScrubyConfig.max_workers
@@ -126,8 +126,8 @@ class Scruby(
             await meta_dir_path.mkdir(parents=True)
             meta = _Meta(
                 collection_name=class_model.__name__,
-                hash_reduce_left=ScrubyConfig.HASH_REDUCE_LEFT,
-                max_number_branch=ScrubyConfig.MAX_NUMBER_BRANCH,
+                hash_reduce_left=instance.__dict__["_hash_reduce_left"],
+                max_number_branch=instance.__dict__["_max_number_branch"],
                 counter_documents=0,
             )
             # Save metadata of collection.
@@ -245,6 +245,7 @@ class Scruby(
         DocCache.cache = {}
         with contextlib.suppress(FileNotFoundError):
             rmtree(ScrubyConfig.db_root)
+        ScrubyConfig.restore()
         return
 
     @staticmethod

scruby/mixins/count.py

@@ -63,9 +63,9 @@ class Count:
             futures: list[Future] = [
                 executor.submit(
                     search_task_fn,
-                    branch_number,
                     filter_fn,
                     hash_reduce_left,
+                    branch_number,
                     class_model,
                     stop_signal,
                 )

scruby/mixins/custom_task.py

@@ -41,8 +41,8 @@ class CustomTask:
         return custom_task_fn(
             search_task_fn=self._task_find,
             filter_fn=filter_fn,
-            branch_numbers=range(self._max_number_branch),
             hash_reduce_left=hash_reduce_left,
+            branch_numbers=range(self._max_number_branch),
             class_model=self._class_model,
             max_workers=self._max_workers,
             stop_signal=Event(),

scruby/mixins/delete.py

@@ -24,10 +24,10 @@ class Delete:
     @final
     @staticmethod
     async def _task_delete(
-        branch_number: int,
         filter_fn: Callable,
-        hash_reduce_left: int,
         db_root: str,
+        hash_reduce_left: int,
+        branch_number: int,
         class_model: Any,
     ) -> int:
         """Asynchronous task for find and delete documents.
@@ -107,10 +107,10 @@ class Delete:
             futures: list[Future] = [
                 executor.submit(
                     search_task_fn,
-                    branch_number,
                     filter_fn,
-                    hash_reduce_left,
                     db_root,
+                    hash_reduce_left,
+                    branch_number,
                     class_model,
                 )
                 for branch_number in branch_numbers

scruby/mixins/find.py

@@ -38,9 +38,9 @@ class Find:
     @final
     @staticmethod
     def _task_find(
-        branch_number: int,
         filter_fn: Callable,
         hash_reduce_left: int,
+        branch_number: int,
         class_model: Any,
         stop_event: Event,
     ) -> list[Any] | None:
@@ -112,9 +112,9 @@ class Find:
             futures: list[Future] = [
                 executor.submit(
                     search_task_fn,
-                    branch_number,
                     filter_fn,
                     hash_reduce_left,
+                    branch_number,
                     class_model,
                     stop_signal,
                 )
@@ -200,9 +200,9 @@ class Find:
             futures: list[Future] = [
                 executor.submit(
                     search_task_fn,
-                    branch_number,
                     filter_fn,
                     hash_reduce_left,
+                    branch_number,
                     class_model,
                     stop_signal,
                 )

scruby/mixins/update.py

@@ -25,10 +25,10 @@ class Update:
     @final
     @staticmethod
     async def _task_update(
-        branch_number: int,
         filter_fn: Callable,
-        hash_reduce_left: int,
         db_root: str,
+        hash_reduce_left: int,
+        branch_number: int,
         class_model: Any,
         new_data: dict[str, Any],
     ) -> int:
@@ -121,10 +121,10 @@ class Update:
             futures: list[Future] = [
                 executor.submit(
                     update_task_fn,
-                    branch_number,
                     filter_fn,
-                    hash_reduce_left,
                     db_root,
+                    hash_reduce_left,
+                    branch_number,
                     class_model,
                     copy.deepcopy(new_data),
                 )

{scruby-2.1.2.dist-info → scruby-2.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scruby
-Version: 2.1.2
+Version: 2.2.1
 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

scruby-2.2.1.dist-info/RECORD

@@ -0,0 +1,21 @@
+scruby/__init__.py,sha256=DEtbZThadMKpKcGGjWyAFGu4IADg9ZYTb8WjfO_3Dqg,1300
+scruby/aggregation.py,sha256=NBFxQqyRqUG2KIuD9fbl4uzSHJWTaskjiZ1YNBa-Zbo,3575
+scruby/cache.py,sha256=hRj9Ix4XeYQzoAtav5lSXxuBZaxpqMzTg0sYAMBIEjM,3768
+scruby/config.py,sha256=INAFqNAeF8BifIywjElC97rawfTLuqpRfieUdAO7A6k,5122
+scruby/db.py,sha256=OtAwHtXoHaF_obqMwxn157EtVppO0tO6Dx2lWGFBEiA,9999
+scruby/errors.py,sha256=lTWiHzyO5Es9Nkf7quODJjONGn6ifcL95qlpA4epQQM,1386
+scruby/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+scruby/utils.py,sha256=ZwWxSyh_BAOQkXlIqXFOlX2lHVk9rfYGQiVqtTk8PpE,1865
+scruby/mixins/__init__.py,sha256=nT79e80zXliuTGhR9CFosI2-3PQUCKwXbR7wPiFwgrU,669
+scruby/mixins/collection.py,sha256=nTw0jnybox3iso0jzNoJiu61Hb-92zl84hdWhlWbik4,1792
+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.2.1.dist-info/METADATA,sha256=Rpmh_TEK9wIRrJFR_U_U31H-pYgU0P7dgy2xpLTy9KU,13500
+scruby-2.2.1.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
+scruby-2.2.1.dist-info/licenses/GPL-3.0-LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+scruby-2.2.1.dist-info/licenses/MIT-LICENSE,sha256=mS0Wz0yGNB63gEcWEnuIb_lldDYV0sjRaO-o_GL6CWE,1074
+scruby-2.2.1.dist-info/RECORD,,

scruby-2.1.2.dist-info/RECORD

@@ -1,21 +0,0 @@
-scruby/__init__.py,sha256=40UhjME7WRJ-kHmqju4tMx9t1t6Sq6-EtL1LwgbTbcA,1280
-scruby/aggregation.py,sha256=NBFxQqyRqUG2KIuD9fbl4uzSHJWTaskjiZ1YNBa-Zbo,3575
-scruby/cache.py,sha256=hRj9Ix4XeYQzoAtav5lSXxuBZaxpqMzTg0sYAMBIEjM,3768
-scruby/config.py,sha256=Wf_mY-GpKhUvGmN7LBFMvRJ3bsYI0nVH6BjH9LWxosg,4802
-scruby/db.py,sha256=QRfC8BTMhlOlqTI2fYRtPsUjmtQUGyQX6eXATA9xHL4,9950
-scruby/errors.py,sha256=lTWiHzyO5Es9Nkf7quODJjONGn6ifcL95qlpA4epQQM,1386
-scruby/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scruby/utils.py,sha256=ZwWxSyh_BAOQkXlIqXFOlX2lHVk9rfYGQiVqtTk8PpE,1865
-scruby/mixins/__init__.py,sha256=nT79e80zXliuTGhR9CFosI2-3PQUCKwXbR7wPiFwgrU,669
-scruby/mixins/collection.py,sha256=nTw0jnybox3iso0jzNoJiu61Hb-92zl84hdWhlWbik4,1792
-scruby/mixins/count.py,sha256=LJHSfKgdyRgRXhz8ii_NBB-mu3ZBWr4_3_IJU6ANeMk,2561
-scruby/mixins/custom_task.py,sha256=vx1TyefM-P2OrXSIN0IXiGDuYiDekgNaOR66G0Eh6Fk,1547
-scruby/mixins/delete.py,sha256=SI_znHz_5zMnh8lEZxLXBbc3Nnewr7fBwnHfDD1syjw,4328
-scruby/mixins/find.py,sha256=BuioqvMEAVKPPch2bdPc1UxtSCBBXpnFjhINVfU7I7k,9169
-scruby/mixins/keys.py,sha256=MvBy_8fQGROaQATK2qse2V8wR-xodPQG0KKZ2PK_t9U,10790
-scruby/mixins/update.py,sha256=oLucFA6ckoPKpSHrGRYPxoEJnjGnXlcGLp0gfkwVECs,4964
-scruby-2.1.2.dist-info/METADATA,sha256=ZHGVK97VQoEW3VTFGNsjEMO7A7BON4ylGZOPV38X1EA,13500
-scruby-2.1.2.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
-scruby-2.1.2.dist-info/licenses/GPL-3.0-LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-scruby-2.1.2.dist-info/licenses/MIT-LICENSE,sha256=mS0Wz0yGNB63gEcWEnuIb_lldDYV0sjRaO-o_GL6CWE,1074
-scruby-2.1.2.dist-info/RECORD,,