From b5d33bd85997c24b803963b0187b520de366d4c9 Mon Sep 17 00:00:00 2001 From: Ray Li Date: Mon, 23 Sep 2024 13:58:27 -0500 Subject: [PATCH] Reformat Files --- omymodels/models/dataclass/core.py | 30 +++++++++++++++--------------- omymodels/models/pydantic/core.py | 28 ++++++++++++++-------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/omymodels/models/dataclass/core.py b/omymodels/models/dataclass/core.py index 2e4b755..cf6dcb0 100644 --- a/omymodels/models/dataclass/core.py +++ b/omymodels/models/dataclass/core.py @@ -52,9 +52,9 @@ def generate_attr(self, column: Column, defaults_off: bool) -> str: if column.default and defaults_off is False: column_str = self.add_column_default(column_str, column) if ( - column.nullable - and not (column.default and not defaults_off) - and not defaults_off + column.nullable + and not (column.default and not defaults_off) + and not defaults_off ): column_str += dt.dataclass_default_attr.format(default=None) return column_str @@ -71,13 +71,13 @@ def add_column_default(column_str: str, column: Column) -> str: return column_str def generate_model( - self, - table: TableMeta, - singular: bool = True, - exceptions: Optional[List] = None, - defaults_off: Optional[bool] = False, - *args, - **kwargs, + self, + table: TableMeta, + singular: bool = True, + exceptions: Optional[List] = None, + defaults_off: Optional[bool] = False, + *args, + **kwargs, ) -> str: model = "" @@ -85,11 +85,11 @@ def generate_model( model += "\n\n" # generate class name model += ( - dt.dataclass_class.format( - class_name=create_class_name(table.name, singular, exceptions), - table_name=table.name, - ) - ) + "\n\n" + dt.dataclass_class.format( + class_name=create_class_name(table.name, singular, exceptions), + table_name=table.name, + ) + ) + "\n\n" columns = {"default": [], "non_default": []} # generate columns / attrs diff --git a/omymodels/models/pydantic/core.py b/omymodels/models/pydantic/core.py index a66de13..a1ea0ae 100644 --- a/omymodels/models/pydantic/core.py +++ b/omymodels/models/pydantic/core.py @@ -72,11 +72,11 @@ def add_default_values(column_str: str, column: Column) -> str: if datetime_now_check(column.default.lower()): # Handle functions like CURRENT_TIMESTAMP column.default = "datetime.datetime.now()" - elif column.default.upper() != 'NULL' and "'" not in column.default: + elif column.default.upper() != "NULL" and "'" not in column.default: column.default = f"'{column.default}'" # If the default is 'NULL', don't set a default in Pydantic (it already defaults to None) - if column.default.upper() == 'NULL': + if column.default.upper() == "NULL": return column_str # Append the default value if it's not None (e.g., explicit default values like '0' or CURRENT_TIMESTAMP) @@ -84,23 +84,23 @@ def add_default_values(column_str: str, column: Column) -> str: return column_str def generate_model( - self, - table: TableMeta, - singular: bool = True, - exceptions: Optional[List] = None, - defaults_off: Optional[bool] = False, - *args, - **kwargs, + self, + table: TableMeta, + singular: bool = True, + exceptions: Optional[List] = None, + defaults_off: Optional[bool] = False, + *args, + **kwargs, ) -> str: model = "" # mean one model one table model += "\n\n" model += ( - pt.pydantic_class.format( - class_name=create_class_name(table.name, singular, exceptions), - table_name=table.name, - ) - ) + "\n\n" + pt.pydantic_class.format( + class_name=create_class_name(table.name, singular, exceptions), + table_name=table.name, + ) + ) + "\n\n" for column in table.columns: column = t.prepare_column_data(column)