fred-oss 0.16.0__tar.gz → 0.18.0__tar.gz

{fred_oss-0.16.0/src/main/fred_oss.egg-info → fred_oss-0.18.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fred-oss
-Version: 0.16.0
+Version: 0.18.0
 Summary: FREDOSS
 Home-page: https://fred.fahera.mx
 Author: Fahera Research, Education, and Development

{fred_oss-0.16.0 → fred_oss-0.18.0}/src/main/fred/dao/comp/_keyval.py

@@ -12,8 +12,9 @@ class FredKeyVal(ComponentInterface):
     getting, and deleting key-value pairs. The actual implementation of these methods
     depends on the underlying service being used (e.g., Redis).
     """
+    key: str
     
-    def set(self, key: str, value: str, **kwargs) -> None:
+    def set(self, value: str, key: Optional[str] = None, **kwargs) -> None:
         """Sets a key-value pair in the store.
         The implementation of this method depends on the underlying service.
         For example, if the service is Redis, it uses the SET command to store the
@@ -26,6 +27,7 @@ class FredKeyVal(ComponentInterface):
         Raises:
             NotImplementedError: If the method is not implemented for the current service.
         """
+        key = key or self.key
         match self._cat:
             case ServiceCatalog.REDIS:
                 self._srv.client.set(key, value)
@@ -35,7 +37,7 @@ class FredKeyVal(ComponentInterface):
             case _:
                 raise NotImplementedError(f"Set method not implemented for service {self._nme}")
 
-    def get(self, key: str, fail: bool = False) -> Optional[str]:
+    def get(self, key: Optional[str] = None, fail: bool = False) -> Optional[str]:
         """Gets the value associated with a key from the store.
         The implementation of this method depends on the underlying service.
         For example, if the service is Redis, it uses the GET command to retrieve the
@@ -50,6 +52,7 @@ class FredKeyVal(ComponentInterface):
             KeyError: If the key is not found and fail is True.
             NotImplementedError: If the method is not implemented for the current service.
         """
+        key = key or self.key
         match self._cat:
             case ServiceCatalog.REDIS:
                 result = self._srv.client.get(key)
@@ -59,7 +62,7 @@ class FredKeyVal(ComponentInterface):
             case _:
                 raise NotImplementedError(f"Get method not implemented for service {self._nme}")
 
-    def delete(self, key: str) -> None:
+    def delete(self, key: Optional[str] = None) -> None:
         """Deletes a key-value pair from the store.
         The implementation of this method depends on the underlying service.
         For example, if the service is Redis, it uses the DEL command to remove the
@@ -69,6 +72,7 @@ class FredKeyVal(ComponentInterface):
         Raises:
             NotImplementedError: If the method is not implemented for the current service.
         """
+        key = key or self.key
         match self._cat:
             case ServiceCatalog.REDIS:
                 self._srv.client.delete(key)

{fred_oss-0.16.0 → fred_oss-0.18.0}/src/main/fred/dao/comp/catalog.py

@@ -2,7 +2,7 @@ import enum
 from functools import lru_cache
 from typing import Optional
 
-from fred.dao.comp.interface import ComponentInterface
+from fred.dao.comp.interface import ComponentInterface, SRV_REF_TYPE
 from fred.dao.comp._queue import FredQueue
 from fred.dao.comp._keyval import FredKeyVal
 
@@ -52,7 +52,7 @@ class CompCatalog(enum.Enum):
 
     @classmethod
     @lru_cache(maxsize=None)  # TODO: Consider cache invalidation strategy if needed
-    def preconf(cls, srv_name: str, **kwargs) -> enum.Enum:
+    def preconf(cls, srv_ref: SRV_REF_TYPE, **kwargs) -> enum.Enum:
         """Create a new Enum with preconfigured components for a specific service name.
         Args:
             srv_name (str): The service name to preconfigure the components with.
@@ -60,9 +60,21 @@ class CompCatalog(enum.Enum):
         Returns:
             enum.Enum: A new Enum class with preconfigured components.
         """
+        from fred.dao.service.interface import ServiceInterface
+        from fred.dao.service.catalog import ServiceCatalog
+        srv_name = ""
+        match srv_ref:
+            case str() as name:
+                srv_name = name.title()
+            case ServiceCatalog() as cat:
+                srv_name = cat.name.title()
+            case ServiceInterface() as instance:
+                srv_name = ServiceCatalog.from_classname(instance.__class__.__name__).name.title()
+            case _:
+                raise ValueError(f"Invalid service '{srv_ref}' type: {type(srv_ref)}")
         return enum.Enum(
             f"{srv_name.title()}{cls.__name__}",
-            {item.name: item.value.mount(srv_name=srv_name, **kwargs) for item in cls},
+            {item.name: item.value.mount(srv_ref=srv_ref, **kwargs) for item in cls},
             type=_PreconfCatalogMixin,
         )
 
@@ -73,12 +85,12 @@ class CompCatalog(enum.Enum):
         """
         return self.value
 
-    def auto(self, srv_name: Optional[str] = None, **kwargs) -> ComponentInterface:
+    def auto(self, srv_ref: Optional[SRV_REF_TYPE] = None, **kwargs) -> ComponentInterface:
         """Automatically creates an instance of the component, mounting it to a service.
         This method is a convenience wrapper that first mounts the component to a service
         and then creates an instance of the component.
         Args:
-            srv_name (Optional[str]): The name of the service to mount. Defaults to None.
+            srv_ref (Optional[SRV_REF_TYPE]): The service reference to mount the component to.
             **kwargs: Additional keyword arguments for both mounting the service and
                       creating the component instance. If there are specific arguments
                       for the service, they should be passed under the key `srv_kwargs`
@@ -86,4 +98,5 @@ class CompCatalog(enum.Enum):
         Returns:
             ComponentInterface: An instance of the component.
         """
-        return self.value.auto(srv_name=srv_name, **kwargs)
+        srv_ref = srv_ref or kwargs.pop("srv_name", None)  # Backward compatibility
+        return self.value.auto(srv_ref=srv_ref, **kwargs)

{fred_oss-0.16.0 → fred_oss-0.18.0}/src/main/fred/dao/comp/interface.py

@@ -2,12 +2,14 @@ from typing import Optional
 from fred.dao.service.interface import ServiceInterface
 from fred.dao.service.catalog import ServiceCatalog
 
+SRV_REF_TYPE = str | ServiceInterface | ServiceCatalog
+
 
 class SrvCompanionMixin:
     _srv: ServiceInterface
 
     @classmethod
-    def _set_srv(cls, name: Optional[str] = None, **kwargs):
+    def _set_srv(cls, srv_ref: Optional[SRV_REF_TYPE] = None, **kwargs):
         """Sets the service instance for the component class.
         This method initializes the `_srv` class variable with an instance
         of the service specified by `name` and any additional parameters passed via `kwargs`.
@@ -15,7 +17,15 @@ class SrvCompanionMixin:
             name (Optional[str]): The name of the service to set. Defaults to "REDIS".
             **kwargs: Additional keyword arguments to configure the service instance.
         """
-        cls._srv = ServiceCatalog[(name or "REDIS").upper()].auto(**kwargs)
+        match (srv_ref or "REDIS"):
+            case str() as name:
+                cls._srv = ServiceCatalog[name.upper()].auto(**kwargs)
+            case ServiceCatalog() as cat:
+                cls._srv = cat.auto(**kwargs)
+            case ServiceInterface() as instance:
+                cls._srv = instance
+            case _:
+                raise ValueError(f"Invalid service '{srv_ref}' type: {type(srv_ref)}")
     
     @property
     def _nme(self) -> str:
@@ -31,7 +41,7 @@ class SrvCompanionMixin:
 class ComponentInterface(SrvCompanionMixin):
 
     @classmethod
-    def mount(cls, srv_name: Optional[str] = None, **kwargs) -> type["ComponentInterface"]:
+    def mount(cls, srv_ref: Optional[SRV_REF_TYPE] = None, **kwargs) -> type["ComponentInterface"]:
         """Mounts the component to a specific service instance.
         This method configures the component to use a service instance
         identified by `srv_name` and any additional parameters passed via `kwargs`.
@@ -40,11 +50,11 @@ class ComponentInterface(SrvCompanionMixin):
             srv_name (Optional[str]): The name of the service to mount. Defaults to "REDIS".
             **kwargs: Additional keyword arguments to configure the service instance.
         """
-        cls._set_srv(name=srv_name, **kwargs)
+        cls._set_srv(srv_ref=srv_ref, **kwargs)
         return cls
 
     @classmethod
-    def auto(cls, srv_name: Optional[str] = None, **kwargs) -> "ComponentInterface":
+    def auto(cls, srv_ref: Optional[SRV_REF_TYPE] = None, **kwargs) -> "ComponentInterface":
         """Automatically creates an instance of the component, mounting it to a service.
         This method is a convenience wrapper that first mounts the component to a service
         and then creates an instance of the component.
@@ -56,4 +66,4 @@ class ComponentInterface(SrvCompanionMixin):
                       as a dictionary.
         """
         srv_kwargs = kwargs.pop("srv_kwargs", {})
-        return cls.mount(srv_name=srv_name, **srv_kwargs)(**kwargs)
+        return cls.mount(srv_ref=srv_ref, **srv_kwargs)(**kwargs)

{fred_oss-0.16.0 → fred_oss-0.18.0}/src/main/fred/dao/service/catalog.py

@@ -1,9 +1,12 @@
 import enum
 from functools import lru_cache
+from typing import TypeVar, Optional
 
 from fred.dao.service.interface import ServiceInterface
 from fred.dao.service._redis import RedisService
 
+T = TypeVar("T")
+
 
 class ServiceCatalog(enum.Enum):
     REDIS = RedisService
@@ -16,7 +19,7 @@ class ServiceCatalog(enum.Enum):
         raise ValueError(f"No service found for classname: {classname}")
 
     @lru_cache(maxsize=None)  # TODO: Consider cache invalidation strategy if needed
-    def component_catalog(self, **kwargs) -> enum.Enum:
+    def component_catalog(self, srv_ref: Optional[str | ServiceInterface] = None, **kwargs) -> enum.Enum:
         """Get a preconfigured component catalog for this (self) service.
         This method returns a new Enum with preconfigured components for the
         service represented by this enum member.
@@ -27,10 +30,10 @@ class ServiceCatalog(enum.Enum):
         """
         from fred.dao.comp.catalog import CompCatalog  # Avoid circular import
 
-        return CompCatalog.preconf(srv_name=self.name, **kwargs)
+        return CompCatalog.preconf(srv_ref=srv_ref or self.name, **kwargs)
 
     def service_cls(self) -> type[ServiceInterface]:
         return self.value
 
-    def auto(self, **kwargs) -> ServiceInterface:
+    def auto(self, **kwargs) -> ServiceInterface[T]:
         return self.value.auto(**kwargs)

fred_oss-0.18.0/src/main/fred/version

@@ -0,0 +1 @@
+0.18.0

{fred_oss-0.16.0 → fred_oss-0.18.0/src/main/fred_oss.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fred-oss
-Version: 0.16.0
+Version: 0.18.0
 Summary: FREDOSS
 Home-page: https://fred.fahera.mx
 Author: Fahera Research, Education, and Development

fred_oss-0.16.0/src/main/fred/version

@@ -1 +0,0 @@
-0.16.0