Merge pull request #3 from the-sam963/new-feature

New feature

Author: CodingSamrat

filexdb/collection.py

@@ -22,13 +22,11 @@ def __init__(self, col_name: str, file_handler: FileIO) -> None:
         self._database = self._get_database()
 
         # Initiating Collecting
-        self._collection = self._get_collection()
+        self._collection: JsonArray = self._get_collection()
 
         # Cursor
         self._cursor: int = 0
 
-
-
     def insert(self, document: Mapping) -> str:
         """
         Inserts a single Document into the Database.
@@ -47,18 +45,17 @@ def insert(self, document: Mapping) -> str:
         if "_id_" in document.keys():
             raise KeyError(f"You are not allowed to modify key `_id_`")
 
-
         # getting Database
         _database = self._get_database()
 
         # Create a Document
         _document = Document(document)
 
         # ID of Document
-        _doc_id: str = _document.id
+        _doc_id: str = str(_document.id)
 
         # check Document is already exist or not
-        if not self._doc_is_exists(_document.id):
+        if not self._doc_is_exists(str(_document.id)):
 
             # Append the document into the Collection
             self._collection.append(_document)
@@ -74,7 +71,7 @@ def insert(self, document: Mapping) -> str:
         else:
             raise ValueError(f"Document id `{_document.id}` is already exists")
 
-    def insert_all(self, document_list: List[Mapping]) -> JsonArray[str]:
+    def insert_all(self, document_list: List[Mapping]) -> JsonArray:
         """
         Inserts a single ``Document`` into the ``Database``.
 
@@ -98,7 +95,7 @@ def insert_all(self, document_list: List[Mapping]) -> JsonArray[str]:
 
         return JsonArray(_doc_id)
 
-    def find(self, query=None, limit=None) -> JsonArray[Document]:
+    def find(self, query=None, limit=None) -> JsonArray:
         """
         Finds all ``Document`` of ``Collection``.
 
@@ -125,7 +122,7 @@ def find(self, query=None, limit=None) -> JsonArray[Document]:
                 raise ValueError('Document is not a Tuple')
 
         # if limit, Check everything ok
-        _limit_start = _limit_end = None
+        _limit_start = _limit_end = 0
 
         if limit and type(limit) == type((1, 3)):
             if len(limit) == 2:
@@ -192,7 +189,7 @@ def find(self, query=None, limit=None) -> JsonArray[Document]:
 
         return JsonArray(_result)
 
-    def delete(self, query=None) -> JsonArray[str]:
+    def delete(self, query=None) -> JsonArray:
         """
         Delete single or multiple Document when meet the Conditions or ``query``.
 
@@ -217,7 +214,7 @@ def delete(self, query=None) -> JsonArray[str]:
 
         return JsonArray(_doc_id)
 
-    def update(self, document: Mapping, query=None) -> JsonArray[str]:
+    def update(self, document: Mapping, query=None) -> JsonArray:
         """
         Fetch all the Documents mathc the conditions and update them.
 
@@ -267,7 +264,6 @@ def rename(self, new_name: str) -> int:
 
         # Checking the collection is already exist or not
         if new_name not in self._database.keys():
-
             # Creating new collection and
             # Putting old data into new collection
             self._database[new_name] = self._collection
@@ -309,7 +305,6 @@ def drop(self) -> int:
 
         return count
 
-
     # ----------------------------------------------------------------#
     def _get_database(self) -> Document:
         """
@@ -338,10 +333,9 @@ def _get_collection(self) -> JsonArray:
         else:
             # Create new Collection
             self._database[self._col_name] = JsonArray([])
-            _collection: JsonArray = self._database[self._col_name]
-
-        return _collection
+            _collection = self._database[self._col_name]
 
+        return JsonArray(_collection)
 
     def _reset_cursor(self) -> None:
         """
@@ -350,7 +344,7 @@ def _reset_cursor(self) -> None:
         """
         self._cursor = 0
 
-    def _find_document_by_query(self, query: Mapping) -> JsonArray[Document]:
+    def _find_document_by_query(self, query: Mapping) -> JsonArray | None:
         """
         Finds a single ``Document`` of ``Collection``.
 
@@ -423,5 +417,3 @@ def _doc_is_exists(self, doc_id: str) -> bool:
                 return True
 
         return False
-
-

filexdb/database.py

@@ -1,7 +1,7 @@
 from typing import Dict, Type, List
 
 from .collection import Collection
-from .fileio import BinaryFileIO, JsonFileIO, Export
+from .fileio import FileIO, BinaryFileIO, JsonFileIO, Export
 from .document import JsonArray, Document
 
 
@@ -21,6 +21,7 @@ def __init__(self, db_name: str, data_dir=None, mode="binary"):
         """
         self._db_name = db_name
         self._data_dir = data_dir
+        self._file_handler: FileIO
 
         # Creating an instance of FileIO to Read Write Database-File.
         if mode == "binary":
@@ -51,7 +52,7 @@ def show_collections(self) -> JsonArray:
         Shows all collections of database.
         :return: List Collections.
         """
-        self._database = self._file_handler.read()
+        self._database = Document(self._file_handler.read(), False)
 
         # Initiating empty result list
         _result = JsonArray(list(self._database.keys()))
@@ -77,5 +78,5 @@ def _show(self) -> Document:
 
         :return: Database
         """
-        self._database = self._file_handler.read()
+        self._database = Document(self._file_handler.read(), False)
         return Document(self._database, False)

filexdb/document.py

@@ -1,4 +1,4 @@
-from typing import Mapping, List
+from typing import Mapping, List, Any
 import uuid
 import json
 from .fileio import Export
@@ -41,9 +41,9 @@ def prettify(self) -> str:
         """
 
         # Dumping JSON Object & adding indentation
-        self._doc = json.dumps(self._doc, indent=4)
+        _doc: str = json.dumps(self._doc, indent=4)
 
-        return self._doc
+        return _doc
 
 
 
@@ -63,9 +63,9 @@ def prettify(self) -> str:
         """
 
         # Dumping JSON Object & adding indentation
-        self.value = json.dumps(self.value, indent=4)
+        value: str = json.dumps(self.value, indent=4)
 
-        return self.value
+        return value
 
     def count_item(self) -> int:
         """

filexdb/fileio.py

@@ -3,13 +3,14 @@
 import os
 import io
 from abc import ABC, abstractmethod
+# from filexdb.document import Document
 
 __all__ = ("FileIO", "JsonFileIO", "BinaryFileIO", "Export")
 
 from typing import Tuple
 
 
-def create_file(db_name: str, data_dir: str = None):
+def create_file(db_name: str, data_dir: str | None):
     """
     Create a file if it doesn't exist yet.
 

tox.ini

@@ -0,0 +1,19 @@
+[tox]
+envlist = py{37,38,39,310}-{pytest,mypy}
+
+
+[testenv:py310-pytest]
+description = Run pytest.
+deps =
+    pytest
+;    {[env]deps}
+commands =
+    pytest
+
+
+[testenv:py310-mypy]
+description = Run mypy
+deps =
+    mypy
+commands =
+    mypy --install-types --non-interactive {toxinidir}/filexdb