libinephany 0.14.0__tar.gz → 0.14.1__tar.gz

libinephany-0.14.1/CODE_VERSION.cfg

@@ -0,0 +1 @@
+0.14.1

{libinephany-0.14.0/libinephany.egg-info → libinephany-0.14.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: libinephany
-Version: 0.14.0
+Version: 0.14.1
 Summary: Inephany library containing code commonly used by multiple subpackages.
 Author-email: Inephany <info@inephany.com>
 License: Apache 2.0

{libinephany-0.14.0 → libinephany-0.14.1}/libinephany/pydantic_models/schemas/inner_task_profile.py

@@ -24,6 +24,7 @@ class InnerTaskProfile(BaseModel):
     number_of_layers: int
     observation_space_sizes: dict[str, int]
     action_space_sizes: dict[str, int]
+    number_of_parameters: int
     vram_usage: float
     idle_vram_usage: float
 
@@ -206,6 +207,7 @@ class InnerTaskProfiles(BaseModel):
         number_of_layers: int,
         observation_space_sizes: dict[str, int],
         action_space_sizes: dict[str, int],
+        number_of_parameters: int,
         vram_usage: float,
         idle_vram_usage: float,
     ) -> None:
@@ -226,6 +228,7 @@ class InnerTaskProfiles(BaseModel):
             number_of_layers=number_of_layers,
             observation_space_sizes=observation_space_sizes,
             action_space_sizes=action_space_sizes,
+            number_of_parameters=number_of_parameters,
             vram_usage=vram_usage,
             idle_vram_usage=idle_vram_usage,
         )

{libinephany-0.14.0 → libinephany-0.14.1}/libinephany/utils/samplers.py

@@ -6,6 +6,7 @@
 
 import math
 from abc import abstractmethod
+from typing import Any
 
 import numpy as np
 
@@ -20,14 +21,14 @@ from libinephany.utils import random_seeds
 
 class Sampler:
 
-    def __init__(self, lower_bound: float | int, upper_bound: float | int, **kwargs) -> None:
+    def __init__(self, lower_bound: float | int | None, upper_bound: float | int | None, **kwargs) -> None:
         """
         :param lower_bound: Lower bound of the distribution to sample from.
         :param upper_bound: Upper bound of the distribution to sample from.
         :param kwargs: Miscellaneous keyword arguments.
         """
 
-        if upper_bound < lower_bound:
+        if upper_bound is not None and lower_bound is not None and upper_bound < lower_bound:
             upper_bound, lower_bound = lower_bound, upper_bound
 
         self.lower_bound = lower_bound
@@ -37,11 +38,11 @@ class Sampler:
         self,
         number_of_samples: int = 1,
         seed: int | None = None,
-    ) -> np.ndarray | float:
+    ) -> list[Any] | np.ndarray | float:
         """
         :param number_of_samples: Number of samples to make.
         :param seed: Random seed to use for distribution sampling.
-        :return: Array of sampled values or a single sampled value.
+        :return: List/Array of sampled values or a single sampled value.
         """
 
         if seed is not None:
@@ -49,10 +50,16 @@ class Sampler:
 
         sample = self.sample(number_of_samples=number_of_samples)
 
-        return sample.item() if sample.size == 1 else sample
+        if isinstance(sample, np.ndarray) and sample.size == 1:
+            return sample.item()
+
+        elif isinstance(sample, list) and len(sample) == 1:
+            return sample[0]
+
+        return sample
 
     @abstractmethod
-    def sample(self, number_of_samples: int = 1, **kwargs) -> np.ndarray:
+    def sample(self, number_of_samples: int = 1, **kwargs) -> np.ndarray | list[Any]:
         """
         :param number_of_samples: Number of samples to make.
         :param kwargs: Miscellaneous keyword arguments.
@@ -64,7 +71,7 @@ class Sampler:
 
 class LogUniformSampler(Sampler):
 
-    def sample(self, number_of_samples: int = 1, **kwargs) -> np.ndarray:
+    def sample(self, number_of_samples: int = 1, **kwargs) -> np.ndarray | list[Any]:
         """
         :param number_of_samples: Number of samples to make.
         :param kwargs: Miscellaneous keyword arguments.
@@ -78,7 +85,7 @@ class LogUniformSampler(Sampler):
 
 class UniformSampler(Sampler):
 
-    def sample(self, number_of_samples: int = 1, **kwargs) -> np.ndarray:
+    def sample(self, number_of_samples: int = 1, **kwargs) -> np.ndarray | list[Any]:
         """
         :param number_of_samples: Number of samples to make.
         :param kwargs: Miscellaneous keyword arguments.
@@ -113,7 +120,7 @@ class DiscreteRangeSampler(Sampler):
         self.step = step
         self.sample_dtype = sample_dtype
 
-    def sample(self, number_of_samples: int = 1, **kwargs) -> np.ndarray:
+    def sample(self, number_of_samples: int = 1, **kwargs) -> np.ndarray | list[Any]:
         """
         :param number_of_samples: Number of samples to make.
         :param kwargs: Miscellaneous keyword arguments.
@@ -160,7 +167,7 @@ class RoundRobinSampler(Sampler):
 
         return magnitude_list
 
-    def sample(self, number_of_samples: int = 1, **kwargs) -> np.ndarray:
+    def sample(self, number_of_samples: int = 1, **kwargs) -> np.ndarray | list[Any]:
         """
         :param number_of_samples: Number of samples to make.
         :param kwargs: Miscellaneous keyword arguments.
@@ -187,8 +194,8 @@ class DiscreteValueSampler(Sampler):
 
     def __init__(
         self,
-        discrete_values: list[float | int],
-        sample_dtype: type[np.generic | float | int] = np.float64,
+        discrete_values: list[float | int | str],
+        sample_dtype: type[np.generic | float | int | str] = np.float64,
         **kwargs,
     ) -> None:
         """
@@ -196,12 +203,19 @@ class DiscreteValueSampler(Sampler):
         :param kwargs: Miscellaneous keyword arguments.
         """
 
-        super().__init__(lower_bound=min(discrete_values), upper_bound=max(discrete_values))
+        if sample_dtype == str and any(isinstance(value, str) for value in discrete_values):
+            lower_bound, upper_bound = None, None
+
+        else:
+            lower_bound = min(discrete_values)
+            upper_bound = max(discrete_values)
+
+        super().__init__(lower_bound=lower_bound, upper_bound=upper_bound)  # type: ignore
 
         self.discrete_values = discrete_values
         self.sample_dtype = sample_dtype
 
-    def sample(self, number_of_samples: int = 1, **kwargs) -> np.ndarray:
+    def sample(self, number_of_samples: int = 1, **kwargs) -> np.ndarray | list[Any]:
         """
         :param number_of_samples: Number of samples to make.
         :param kwargs: Miscellaneous keyword arguments.
@@ -234,7 +248,7 @@ class RoundRobinDiscreteValueSampler(Sampler):
 
         self.sampled_elements: set[float] = set()
 
-    def sample(self, number_of_samples: int = 1, **kwargs) -> np.ndarray:
+    def sample(self, number_of_samples: int = 1, **kwargs) -> np.ndarray | list[Any]:
         """
         :param number_of_samples: Number of samples to make.
         :param kwargs: Miscellaneous keyword arguments.
@@ -329,7 +343,7 @@ def sample_from_discrete_range(
     return sample
 
 
-def sample_from_discrete_values(discrete_values: list[float | int], number_of_samples: int = 1) -> np.ndarray:
+def sample_from_discrete_values(discrete_values: list[float | int | str], number_of_samples: int = 1) -> np.ndarray:
     """
     :param discrete_values: List of discrete values to sample from.
     :param number_of_samples: Number of samples to make.

{libinephany-0.14.0 → libinephany-0.14.1/libinephany.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: libinephany
-Version: 0.14.0
+Version: 0.14.1
 Summary: Inephany library containing code commonly used by multiple subpackages.
 Author-email: Inephany <info@inephany.com>
 License: Apache 2.0

libinephany-0.14.0/CODE_VERSION.cfg

@@ -1 +0,0 @@
-0.14.0