fix submodule path error, backport changes to 1.9

Author: MFA-X-AI

.gitmodules

@@ -58,18 +58,18 @@
 [submodule "xai_components/xai_vertexai"]
 	path = xai_components/xai_vertexai
 	url = https://github.com/XpressAI/xai-google-vertexai
-[submodule "xai_component/xai_tensorflow_keras"]
-	path = xai_component/xai_tensorflow_keras
+[submodule "xai_components/xai_tensorflow_keras"]
+	path = xai_components/xai_tensorflow_keras
 	url = https://github.com/XpressAI/xai-tensorflow-keras
-[submodule "xai_component/xai_pytorch"]
-	path = xai_component/xai_pytorch
+[submodule "xai_components/xai_pytorch"]
+	path = xai_components/xai_pytorch
 	url = https://github.com/XpressAI/xai-pytorch
-[submodule "xai_component/xai_sklearn"]
-	path = xai_component/xai_sklearn
+[submodule "xai_components/xai_sklearn"]
+	path = xai_components/xai_sklearn
 	url = https://github.com/XpressAI/xai-sklearn
-[submodule "xai_component/xai_xgboost"]
-	path = xai_component/xai_xgboost
+[submodule "xai_components/xai_xgboost"]
+	path = xai_components/xai_xgboost
 	url = https://github.com/XpressAI/xai-xgboost
-[submodule "xai_component/xai_spark"]
-	path = xai_component/xai_spark
+[submodule "xai_components/xai_spark"]
+	path = xai_components/xai_spark
 	url = https://github.com/XpressAI/xai-spark

xai_components/base.py

@@ -64,19 +64,22 @@ class BaseComponent:
     def __init__(self):
         all_ports = self.__annotations__
         for key, type_arg in all_ports.items():
-            port_class = type_arg.__origin__
-            port_type = type_arg.__args__[0]
-            if port_class in (InArg, InCompArg, OutArg):
-                if hasattr(port_type, 'initial_value'):
-                    port_value = port_type.initial_value()
+            if hasattr(type_arg, '__origin__'):
+                port_class = type_arg.__origin__
+                port_type = type_arg.__args__[0]
+                if port_class in (InArg, InCompArg, OutArg):
+                    if hasattr(port_type, 'initial_value'):
+                        port_value = port_type.initial_value()
+                    else:
+                        port_value = None
+
+                    if hasattr(port_type, 'getter'):
+                        port_getter = port_type.getter
+                    else:
+                        port_getter = lambda x: x
+                    setattr(self, key, port_class(port_value, port_getter))
                 else:
-                    port_value = None
-
-                if hasattr(port_type, 'getter'):
-                    port_getter = port_type.getter
-                else:
-                    port_getter = lambda x: x
-                setattr(self, key, port_class(port_value, port_getter))
+                    setattr(self, key, None)
             else:
                 setattr(self, key, None)
 

xai_component/xai_pytorch renamed to xai_components/xai_pytorch

@@ -1,4 +1,4 @@
-from xai_components.base import InArg, OutArg, InCompArg, Component, BaseComponent, xai_component, dynalist, dynatuple, dynadict
+from xai_components.base import InArg, OutArg, InCompArg, Component, BaseComponent, xai_component, dynalist, dynatuple
 
 from typing import Union
 @xai_component(color="red")
@@ -138,23 +138,19 @@ def do(self, ctx) -> BaseComponent:
 
 @xai_component
 class DynaPorts(Component):
-    """A component showcasing dynamic ports: `dynalist`, `dynatuple`, and `dynadict`.
+    """A component showcasing dynamic ports: `dynalist`, and `dynatuple`.
     
     ##### inPorts:
     - dlist: A `dynalist` port. 
     - dtuple: A `dynatuple` port.
-    - ddict: A `dynadict` port. Accepts only Literal Dicts.
     
     """
 
     dlist: InArg[dynalist]
     dtuple: InArg[dynatuple]
-    ddict: InArg[dynadict]
 
     def execute(self, ctx) -> None:
         print("Printing dynalist value:")
         print(self.dlist.value)
         print("Printing dynatuple value:")
-        print(self.dtuple.value)
-        print("Printing dynadict value:")
-        print(self.ddict.value)
+        print(self.dtuple.value)

xai_component/xai_sklearn renamed to xai_components/xai_sklearn

@@ -1,2 +1,2 @@
-version_info = (1, 9, 3)
+version_info = (1, 9, 4)
 __version__ = ".".join(map(str, version_info))