dbhydra 2.0.11__py3-none-any.whl → 2.0.13__py3-none-any.whl

dbhydra/src/abstract_table.py

@@ -238,8 +238,12 @@ class AbstractTable(AbstractJoinable, abc.ABC):
         super().__init__(db1, name, columns)
         self.types: list[str] = types #[] if types is None else types - is wrong, if types not initialized it should be None, not empty list
         self.id_column_name: str = id_column_name
-        assert len(self.columns) == len(self.types)
-        self.column_type_dict={self.columns[i]:self.types[i] for i,x in enumerate(self.columns)}
+        if self.columns is not None and self.types is not None:
+            assert len(self.columns) == len(self.types) 
+            self.column_type_dict={self.columns[i]:self.types[i] for i,x in enumerate(self.columns)}
+        else:
+            self.column_type_dict={}
+        
 
     # Temporary disabled, please make sure this is implemented where needed, don't introduce breaking changes please
     # @abc.abstractmethod

dbhydra/src/mysql_db.py

@@ -57,11 +57,11 @@ class MysqlDb(AbstractDb):
         tables = [x[0] for x in rows]
         return (tables)
 
-    def generate_table_dict(self):
+    def generate_table_dict(self, id_column_name = "id"):
         tables = self.get_all_tables()
         table_dict = dict()
         for i, table in enumerate(tables):
-            table_dict[table] = MysqlTable.init_all_columns(self, table)
+            table_dict[table] = MysqlTable.init_all_columns(self, table, id_column_name)
         return (table_dict)
 
 

dbhydra/src/tables.py

@@ -890,6 +890,39 @@ class XlsxTable(AbstractTable):
         else:
             df.to_excel(self.table_directory_path, index=False)
 
+    def get_all_columns(self):
+        df=self.select_to_df()
+        columns=df.columns.tolist()
+        return(columns)
+
+
+    def get_all_types(self):
+        df=self.select_to_df()
+        dtypes=df.dtypes.tolist() 
+        types = [str(x) for x in dtypes]
+        clean_types=[x.replace("object","str") for x in types] #Todo support more types
+        
+        return(clean_types) 
+  
+    
+    
+    @classmethod
+    def init_all_columns(cls, db1, name, id_column_name="id"):
+        temporary_table = cls(db1, name, id_column_name)
+        columns = temporary_table.get_all_columns()
+        types = temporary_table.get_all_types()
+
+        if temporary_table.id_column_name in columns:
+            id_col_index = columns.index(temporary_table.id_column_name)
+            columns.pop(id_col_index)
+            columns.insert(0, temporary_table.id_column_name)
+            types.pop(id_col_index)
+            types.insert(0, "int")
+
+        return (cls(db1, name, columns, types, id_column_name=id_column_name))    
+
+
+
     def create(self):
         if not self.table_directory_path.exists():
             df = pd.DataFrame(columns=self.columns)

dbhydra/src/xlsx_db.py

@@ -1,6 +1,7 @@
 from dbhydra.src.abstract_db import AbstractDb
 from dbhydra.src.tables import XlsxTable
 
+import contextlib
 import threading
 import pathlib
 import os
@@ -84,7 +85,22 @@ class XlsxDb(AbstractDb):
         except FileExistsError:
             print("Database directory already exists")
 
+    @contextlib.contextmanager
+    def transaction(self):
+        yield None
 
+    def get_all_tables(self):
+        root,dirs,files=next(os.walk(self.db_directory_path))
+        suffix=".csv" if self.is_csv else ".xlsx"
+        tables = [x.lower().replace(suffix,"") for x in files]
+        return (tables)
+
+    def generate_table_dict(self, id_column_name="id"):
+        tables = self.get_all_tables()
+        table_dict = dict()
+        for i, table in enumerate(tables):
+            table_dict[table] = XlsxTable.init_all_columns(self, table, id_column_name)
+        return (table_dict)
 
 
 class XlsxDB(XlsxDb):

{dbhydra-2.0.11.dist-info → dbhydra-2.0.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dbhydra
-Version: 2.0.11
+Version: 2.0.13
 Summary: Data science friendly ORM combining Python
 Home-page: https://github.com/DovaX/dbhydra
 Author: DovaX

{dbhydra-2.0.11.dist-info → dbhydra-2.0.13.dist-info}/RECORD

@@ -11,23 +11,23 @@ dbhydra/mongo.py,sha256=GeNsv8rkt5DmjN7eEjvgJ5F9XUCwf8zir9DqbAuJswc,1836
 dbhydra/test.py,sha256=SQDd8D_gpAE_14QFw5WCWJCsFq4iEnsvxoGD8vcB9G8,448
 dbhydra/src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dbhydra/src/abstract_db.py,sha256=tY4sNuRQw2qXMXxha9eo9tAmP2z_hcirf04tfDBpwxs,5607
-dbhydra/src/abstract_table.py,sha256=n5-U3WThLzqoWNiQiMZltMmjiOeRuaWEkoFM2PR1w-4,16226
+dbhydra/src/abstract_table.py,sha256=00f3Hb6LUbexvqZFPDaDwfS37Vll-ONwJfwCV-IVuto,16363
 dbhydra/src/bigquery_db.py,sha256=77XsgvYbANlvYaJnuVve-kz-PNBx_CHoYCL-eYnA8e4,1834
 dbhydra/src/migrator.py,sha256=l2MBmiAsv2hv97YmA5IvfbPUK2aAPt46jFulLXBUFHc,4412
 dbhydra/src/mongo_db.py,sha256=mP48zRjI7mXKpm45R8prroZI-Eo7JKf0KJqGX-oTy3w,1922
-dbhydra/src/mysql_db.py,sha256=7U-nBhbK3iwbnb1hRF9t2IoYRFA2m4L6w_ixEMJI4hA,2761
+dbhydra/src/mysql_db.py,sha256=SgwXV-OVwM9HHeQ83gHht5CF3znOqRSaEZOPIyRdiEY,2800
 dbhydra/src/postgres_db.py,sha256=L7MaBq_6ArwDSP_5LaEqK58oLxZ1X7FgIokcDOSB7wk,1805
 dbhydra/src/sqlserver_db.py,sha256=9Xi3NAliqM79MTV8fpNQb0nWMH8Bqjl1leJSEqgyT94,3611
-dbhydra/src/tables.py,sha256=VEqhWM5USNwT8RvINevAQwPJnwwOj8SUn7hyfam6cNc,43191
-dbhydra/src/xlsx_db.py,sha256=Ccxjhbdw4fPHXR5eHjY9KCsMVa-s_NBHVIItxf2eEXY,2813
+dbhydra/src/tables.py,sha256=v-EOdlRp4XwBfticJ0DPumY_FPXwvutYqN9045mMfN0,44246
+dbhydra/src/xlsx_db.py,sha256=Dg-wWafdfa3gSFVdP5Mtn9rNhU4k4R1T0Wx3JyiQZiM,3436
 dbhydra/src/errors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dbhydra/src/errors/exceptions.py,sha256=LVpfbTd3NHfQIM-D5TFAU6hOZwGQ3b5DwFD4B6vtf2U,149
 dbhydra/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dbhydra/tests/test_cases.py,sha256=eAFGaHaIaab3md3HHm2_ryb_HHfObtcXDAEzLh4qWx8,508
 dbhydra/tests/test_mongo.py,sha256=M8TD72M0iQAk7ZcLTWwLmcmmF_zwALnYEGTWjhQlq0s,1979
 dbhydra/tests/test_sql.py,sha256=aPFXyA0jh8o9VG3B5f9fNz7qDbuVPZ9TcE2twn5dAeQ,3126
-dbhydra-2.0.11.dist-info/LICENSE,sha256=k49Yga8CP889JJaHlOpGFzr_be2nqMoep2chYeIDctk,1091
-dbhydra-2.0.11.dist-info/METADATA,sha256=fUJrT5QCb3TYWgujyzgJYhhyDXIQJ_7NhIa4D4VSmVI,2299
-dbhydra-2.0.11.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-dbhydra-2.0.11.dist-info/top_level.txt,sha256=oO4Gf1T8_txIsIlp11GI0k7PtBIMb9GRwb5ObF4MLVg,8
-dbhydra-2.0.11.dist-info/RECORD,,
+dbhydra-2.0.13.dist-info/LICENSE,sha256=k49Yga8CP889JJaHlOpGFzr_be2nqMoep2chYeIDctk,1091
+dbhydra-2.0.13.dist-info/METADATA,sha256=09K_ebuO2xvBibN7gEi1lDm9NGwbruIPoMw-JF0aE5k,2299
+dbhydra-2.0.13.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+dbhydra-2.0.13.dist-info/top_level.txt,sha256=oO4Gf1T8_txIsIlp11GI0k7PtBIMb9GRwb5ObF4MLVg,8
+dbhydra-2.0.13.dist-info/RECORD,,