fix test and filter url kwargs by none

Author: CTY-git

patchwork/step.py

@@ -73,6 +73,8 @@ def __init__(self, inputs: DataPoint):
         self.run = self.__managed_run
 
     def __init_subclass__(cls, input_class: Optional[Type] = None, output_class: Optional[Type] = None, **kwargs):
+        if cls.__name__ == "PreparePR":
+            print(1)
         input_class = input_class or getattr(cls, "input_class", None)
         if input_class is not None and not is_typeddict(input_class):
             input_class = None
@@ -81,14 +83,14 @@ def __init_subclass__(cls, input_class: Optional[Type] = None, output_class: Opt
         if output_class is not None and not is_typeddict(output_class):
             output_class = None
 
-        cls.__input_class = input_class
-        cls.__output_class = output_class
+        cls._input_class = input_class
+        cls._output_class = output_class
 
     @classmethod
     def find_missing_inputs(cls, inputs: DataPoint) -> Collection:
-        if getattr(cls, "__input_class", None) is None:
+        if getattr(cls, "_input_class", None) is None:
             return []
-        return cls.__input_class.__required_keys__.difference(inputs.keys())
+        return cls._input_class.__required_keys__.difference(inputs.keys())
 
     def __managed_run(self, *args, **kwargs) -> Any:
         self.debug(self.inputs)

patchwork/steps/CallSQL/CallSQL.py

@@ -20,19 +20,16 @@ def __build_engine(self, inputs: dict):
         driver = inputs.get("db_driver")
         dialect_plus_driver = f"{dialect}+{driver}" if driver is not None else dialect
         kwargs = dict(
-            username=inputs["db_username"],
+            username=inputs.get("db_username"),
             host=inputs.get("db_host", "localhost"),
             port=inputs.get("db_port", 5432),
+            password=inputs.get("db_password"),
+            database=inputs.get("db_database"),
+            query=inputs.get("db_params"),
         )
-        if inputs.get("db_password") is not None:
-            kwargs["password"] = inputs.get("db_password")
-        if inputs.get("db_name") is not None:
-            kwargs["database"] = inputs.get("db_name")
-        if inputs.get("db_params") is not None:
-            kwargs["query"] = inputs.get("db_params")
         connection_url = URL.create(
             dialect_plus_driver,
-            **kwargs,
+            **{k: v for k, v in kwargs.items() if v is not None},
         )
 
         connect_args = None