zepben.ewb 1.0.0b4__py3-none-any.whl → 1.0.0b5__py3-none-any.whl

zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_static_var_compensator.py

@@ -6,7 +6,7 @@
 __all__ = ["TableStaticVarCompensators"]
 
 from zepben.ewb import TableRegulatingCondEq
-from zepben.ewb.database.sqlite.tables.column import Column, Nullable
+from zepben.ewb.database.sql.column import Column, Nullable
 
 
 class TableStaticVarCompensators(TableRegulatingCondEq):

zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_switches.py

@@ -7,7 +7,7 @@ __all__ = ["TableSwitches"]
 
 from abc import ABC
 
-from zepben.ewb.database.sqlite.tables.column import Column, Nullable
+from zepben.ewb.database.sql.column import Column, Nullable
 from zepben.ewb.database.sqlite.tables.iec61970.base.core.table_conducting_equipment import TableConductingEquipment
 
 

zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_synchronous_machines.py

@@ -5,7 +5,7 @@
 
 __all__ = ["TableSynchronousMachines"]
 
-from zepben.ewb.database.sqlite.tables.column import Column, Nullable
+from zepben.ewb.database.sql.column import Column, Nullable
 from zepben.ewb.database.sqlite.tables.iec61970.base.wires.table_rotating_machines import TableRotatingMachines
 
 

zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_tap_changer_controls.py

@@ -5,7 +5,7 @@
 
 __all__ = ["TableTapChangerControls"]
 
-from zepben.ewb.database.sqlite.tables.column import Column, Nullable
+from zepben.ewb.database.sql.column import Column, Nullable
 from zepben.ewb.database.sqlite.tables.iec61970.base.wires.table_regulating_controls import TableRegulatingControls
 
 

zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_tap_changers.py

@@ -7,7 +7,7 @@ __all__ = ["TableTapChangers"]
 
 from abc import ABC
 
-from zepben.ewb.database.sqlite.tables.column import Column, Nullable
+from zepben.ewb.database.sql.column import Column, Nullable
 from zepben.ewb.database.sqlite.tables.iec61970.base.core.table_power_system_resources import TablePowerSystemResources
 
 

zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_transformer_ends.py

@@ -8,7 +8,7 @@ __all__ = ["TableTransformerEnds"]
 from abc import ABC
 from typing import List, Generator
 
-from zepben.ewb.database.sqlite.tables.column import Column, Nullable
+from zepben.ewb.database.sql.column import Column, Nullable
 from zepben.ewb.database.sqlite.tables.iec61970.base.core.table_identified_objects import TableIdentifiedObjects
 
 

zepben/ewb/database/sqlite/tables/iec61970/base/wires/table_transformer_star_impedances.py

@@ -7,7 +7,7 @@ __all__ = ["TableTransformerStarImpedances"]
 
 from typing import List, Generator
 
-from zepben.ewb.database.sqlite.tables.column import Column, Nullable
+from zepben.ewb.database.sql.column import Column, Nullable
 from zepben.ewb.database.sqlite.tables.iec61970.base.core.table_identified_objects import TableIdentifiedObjects
 
 

zepben/ewb/database/sqlite/tables/iec61970/infiec61970/feeder/table_circuits.py

@@ -7,7 +7,7 @@ __all__ = ["TableCircuits"]
 
 from typing import List, Generator
 
-from zepben.ewb.database.sqlite.tables.column import Column, Nullable
+from zepben.ewb.database.sql.column import Column, Nullable
 from zepben.ewb.database.sqlite.tables.iec61970.base.wires.table_lines import TableLines
 
 

zepben/ewb/database/sqlite/tables/sqlite_table.py

@@ -7,136 +7,39 @@ from __future__ import annotations
 
 __all__ = ["SqliteTable"]
 
-from abc import abstractmethod
-from typing import List, Optional, Type, Any, Generator
+from abc import ABC
+from typing import List, Generator
 
-from zepben.ewb.database.sqlite.tables.column import Column, Nullable
+from zepben.ewb.database.sql.column import Column
+from zepben.ewb.database.sql.sql_table import SqlTable
 
 
-# @dataclass(slots=True)
-class SqliteTable(object):
+class SqliteTable(SqlTable, ABC):
     """
-    Represents a table in an Sqlite Database. This class should be extended and initialised to build the DDL for a Table.
-    Methods that need to be overridden are those marked @abstractmethod.
-    Methods that can be optionally overridden are unique_index_columns() and non_unique_index_columns().
-    Columns must be assigned in __init__ and column_index must be incremented for each Column created.
-    See existing implementations such as TableVersion for examples.
+    Represents a table in an Sqlite Database.
     """
 
-    column_index: int = 0
-    """Used to specify index of the column in the table during initialisation. Always increment BEFORE creating a Column. Indices start from 1."""
-
-    _column_set: Optional[List[Column]] = None
-    _create_table_sql: Optional[str] = None
-    _prepared_insert_sql: Optional[str] = None
-    _prepared_update_sql: Optional[str] = None
-    _create_indexes_sql: Optional[List[str]] = None
-    _select_sql: Optional[str] = None
-
-    @property
-    @abstractmethod
-    def name(self) -> str:
-        pass
-
-    #
-    # NOTE: This function is called `description` in teh JVM SDK, but in the python SDK this
-    #       conflicts with the `description` column of `TableIdentifiedObjects`.
-    #
-    def describe(self) -> str:
-        return self.name.replace("_", " ")
-
     @property
     def create_table_sql(self):
-        return self._create_table_sql if self._create_table_sql else self._build_create_table_sql()
-
-    @property
-    def prepared_insert_sql(self):
-        return self._prepared_insert_sql if self._prepared_insert_sql else self._build_prepared_insert_sql()
+        if self._create_table_sql is None:
+            self._create_table_sql = self._build_create_table_sql()
+        return self._create_table_sql
 
     @property
     def create_indexes_sql(self):
-        return self._create_indexes_sql if self._create_indexes_sql else self._build_indexes_sql()
-
-    @property
-    def select_sql(self):
-        return self._select_sql if self._select_sql else self._build_select_sql()
-
-    @property
-    def prepared_update_sql(self):
-        return self._prepared_update_sql if self._prepared_update_sql else self._build_prepared_update_sql()
-
-    @property
-    def unique_index_columns(self) -> Generator[List[Column], None, None]:
-        # To make this a generator we need to `yield`, but we have nothing to yield by default, so trick it by yielding from an empty for-loop.
-        for it in []:
-            yield it
-
-    @property
-    def non_unique_index_columns(self) -> Generator[List[Column], None, None]:
-        # To make this a generator we need to `yield`, but we have nothing to yield by default, so trick it by yielding from an empty for-loop.
-        for it in []:
-            yield it
-
-    @property
-    def column_set(self) -> List[Column]:
-        return self._column_set if self._column_set else self._build_column_set(self.__class__, self)
-
-    def _build_column_set(self, clazz: Type[Any], instance: SqliteTable) -> List[Column]:
-        """
-        Builds the list of columns for use in DDL statements for this table.
-
-        :param clazz: The class of this table.
-        :param instance:
-        :return:
-        """
-        cols = list()
-        for field, x in instance.__dict__.items():
-            if isinstance(x, Column):
-                if x.query_index != len(cols) + 1:
-                    raise ValueError(
-                        f"Field {field} in SQL Table class {clazz.__name__} is using an invalid column index. "
-                        f"Did you forget to increment column_index, or did you skip one?"
-                    )
-                cols.append(x)
-
-        if len(set([c.name for c in cols])) != len(cols):
-            raise ValueError("You have a duplicate column names, go fix that.")
-
-        self._column_set = sorted(cols, key=lambda it: it.query_index)
-        return self._column_set
-
-    def _build_create_table_sql(self) -> str:
-        self._create_table_sql = f"CREATE TABLE {self.name} ({', '.join([str(c) for c in self.column_set])})"
-        return self._create_table_sql
-
-    def _build_prepared_insert_sql(self) -> str:
-        self._prepared_insert_sql = f"INSERT INTO {self.name} ({', '.join([c.name for c in self.column_set])}) " \
-                                    f"VALUES ({', '.join(['?' for _ in self.column_set])})"
-        return self._prepared_insert_sql
-
-    def _build_indexes_sql(self) -> List[str]:
-        statements = []
-        for index_col in self.unique_index_columns:
-            statements.append(self._build_index_sql(index_col, True))
-        for index_col in self.non_unique_index_columns:
-            statements.append(self._build_index_sql(index_col, False))
-        self._create_indexes_sql = statements
+        if self._create_indexes_sql is None:
+            self._create_indexes_sql = list(self._build_indexes_sql())
         return self._create_indexes_sql
 
-    def _build_index_sql(self, index_col: List[Column], is_unique: bool):
-        id_string = f"{self.name}_{'_'.join(map(lambda c: c.name, index_col))}"
-        col_string = ', '.join(map(lambda c: c.name, index_col))
-        return f"CREATE {'UNIQUE ' if is_unique else ''}INDEX {id_string} ON {self.name} ({col_string})"
-
-    def _build_select_sql(self) -> str:
-        self._select_sql = f"SELECT {', '.join([c.name for c in self.column_set])} FROM {self.name}"
-        return self._select_sql
+    def _build_create_table_sql(self) -> str:
+        return f"CREATE TABLE {self.name} ({', '.join(str(c) for c in self.column_set)})"
 
-    def _build_prepared_update_sql(self) -> str:
-        self._prepared_update_sql = f"UPDATE {self.name} SET {', '.join([f'{c.name} = ?' for c in self.column_set])}"
-        return self._prepared_update_sql
+    def _build_indexes_sql(self) -> Generator[str, None, None]:
+        yield from (self._build_index_sql(index_col, True) for index_col in self.unique_index_columns)
+        yield from (self._build_index_sql(index_col, False) for index_col in self.non_unique_index_columns)
 
-    def _create_column(self, name: str, type_: str, nullable: Nullable = Nullable.NONE) -> Column:
-        self.column_index += 1
-        # noinspection PyArgumentList
-        return Column(self.column_index, name, type_, nullable)
+    def _build_index_sql(self, index_col: List[Column], is_unique: bool) -> str:
+        index_col_names = [c.name for c in index_col]
+        return (f"CREATE {'UNIQUE ' if is_unique else ''}INDEX "
+                f"{self.name}_{'_'.join(index_col_names)}"  # id string
+                f" ON {self.name} ({', '.join(index_col_names)})")  # col string

zepben/ewb/database/sqlite/tables/table_metadata_data_sources.py

@@ -5,7 +5,7 @@
 
 __all__ = ["TableMetadataDataSources"]
 
-from zepben.ewb.database.sqlite.tables.column import Column, Nullable
+from zepben.ewb.database.sql.column import Column, Nullable
 from zepben.ewb.database.sqlite.tables.sqlite_table import SqliteTable
 
 

zepben/ewb/database/sqlite/tables/table_version.py

@@ -9,7 +9,7 @@ import sqlite3
 from sqlite3 import Cursor
 from typing import Optional
 
-from zepben.ewb.database.sqlite.tables.column import Column, Nullable
+from zepben.ewb.database.sql.column import Column, Nullable
 from zepben.ewb.database.sqlite.tables.sqlite_table import SqliteTable
 
 
@@ -17,6 +17,7 @@ class TableVersion(SqliteTable):
     SUPPORTED_VERSION = 59
 
     def __init__(self):
+        super().__init__()
         self.version: Column = self._create_column("version", "TEXT", Nullable.NOT_NULL)
 
     @property

{zepben_ewb-1.0.0b4.dist-info → zepben_ewb-1.0.0b5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zepben.ewb
-Version: 1.0.0b4
+Version: 1.0.0b5
 Summary: Python SDK for interacting with the Energy Workbench platform
 Home-page: https://github.com/zepben/evolve-sdk-python
 Author: Kurt Greaves