Refactoring patch

.gitignore

@@ -157,5 +157,11 @@ cython_debug/
 #  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
+.idea/
 /data1/
+
+# Local folders and files
+execution_time/
+test_distribution/
+cache.json
+local_tests.py

generators/gen.py

@@ -12,4 +12,4 @@ def code(self):
         return super()._convert_to_code(['beta', self.a, self.b])
 
     def generate(self, size):
-        return generate_beta(size=size, a=self.a, b=self.b)
+        return generate_beta(size=size, a=self.a, b=self.b)

pyproject.toml

@@ -0,0 +1,20 @@
+[project]
+name = "stattest"
+version = "0.0.1"
+authors = [
+    { name="Example Author", email="author@example.com" },
+]
+description = "Stattest Project"
+readme = "README.md"
+requires-python = ">=3.8"
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
+]
+
+[project.urls]
+Homepage = "https://github.com/alex98247/statistic-test"
+Issues = "https://github.com/alex98247/statistic-test/issues"
+
+# TODO: fill stub from official documentation

stattest/constants.py

@@ -3,4 +3,4 @@
 Config = dict[str, Any]
 
 USERPATH_GENERATORS = "generators"
-USERPATH_HYPOTHESIS = "hypothesis"
+USERPATH_HYPOTHESIS = "hypothesis"

stattest/core/distribution/expon.py

@@ -1,11 +1,11 @@
 from scipy.stats import expon
 
 
-def generate_expon(size, l=1):
-    scale = 1 / l
+def generate_expon(size, lam=1):  # refactor structure with inheritance
+    scale = 1 / lam
     return expon.rvs(size=size, scale=scale)
 
 
-def cdf_expon(rvs, l=1):
-    scale = 1 / l
+def cdf_expon(rvs, lam=1):
+    scale = 1 / lam
     return expon.cdf(rvs, scale=scale)

stattest/core/distribution/sample.py

@@ -2,9 +2,9 @@
 import numpy as np
 
 
-def moment(a, moment=1, center=None):
-    scipy_moment(a=a, moment=moment, center=center)
+def moment(a, mom=1, center=None):
+    scipy_moment(a=a, moment=mom, center=center)
 
 
-def central_moment(a, moment=1):
-    return scipy_moment(a=a, moment=moment, center=np.mean(a, axis=0))
+def central_moment(a, mom=1):
+    return scipy_moment(a=a, moment=mom, center=np.mean(a, axis=0))

stattest/core/store.py

@@ -18,16 +18,16 @@ def get(self, key: str):
         """
         Get cached value if exists, else return None.
 
-        :param key: cache key
+        :param key: cache_services key
         """
         raise NotImplementedError("Method is not implemented")
 
     def put(self, key: str, value):
         """
-        Put object to cache.
+        Put object to cache_services.
 
-        :param key: cache key
-        :param value: cache value
+        :param key: cache_services key
+        :param value: cache_services value
         """
         raise NotImplementedError("Method is not implemented")
 
@@ -44,7 +44,7 @@ def get(self, key: str):
         """
         Get cached value if exists, else return None.
 
-        :param key: cache key
+        :param key: cache_services key
         """
 
         if key not in self.cache.keys():
@@ -64,10 +64,10 @@ def get_with_level(self, keys: [str]):
 
     def put(self, key: str, value):
         """
-        Put object to cache.
+        Put object to cache_services.
 
-        :param key: cache key
-        :param value: cache value
+        :param key: cache_services key
+        :param value: cache_services value
         """
 
         self.cache[key] = value
@@ -90,7 +90,7 @@ def _create_key(self, keys: [str]):
 class JsonStoreService(InMemoryStoreService):
 
     def __init__(self, filename='cache.json', separator='.'):
-        super().__init__(separator)
+        super().__init__(separator=separator)
         mem_cache = {}
         if os.path.isfile(filename):
             mem_cache = read_json(filename)
@@ -100,10 +100,10 @@ def __init__(self, filename='cache.json', separator='.'):
 
     def put(self, key: str, value):
         """
-        Put object to cache.
+        Put object to cache_services.
 
-        :param key: cache key
-        :param value: cache value
+        :param key: cache_services key
+        :param value: cache_services value
         """
         super().put(key, value)
         write_json(self.filename, self.cache)
@@ -132,7 +132,7 @@ def flush(self):
 class FastJsonStoreService(FastStoreService):
 
     def __init__(self, filename='cache.json', separator='.'):
-        super().__init__(separator)
+        super().__init__(separator=separator)
         mem_cache = {}
         if os.path.isfile(filename):
             mem_cache = read_json(filename)

stattest/exceptions.py

@@ -11,7 +11,8 @@ class OperationalException(PySatlException):
     Most of the time, this is caused by an invalid Configuration.
     """
 
+
 class ConfigurationError(OperationalException):
     """
     Configuration error. Usually caused by invalid configuration.
-    """
+    """

stattest/execution/cache.py

@@ -0,0 +1,100 @@
+from stattest.core.store import FastJsonStoreService, write_json
+
+
+class CacheResultService(FastJsonStoreService):
+
+    def get_with_prefix(self, keys: [str]) -> {}:
+        """
+        Get JSON value by prefix chain in 'keys' param.
+
+        :param keys: keys chain prefix param
+        """
+
+        key_prefix = self._create_key(keys)
+        result = {}
+        for key in self.cache:
+            if key.startswith(key_prefix):
+                result[key] = self.get(key)
+        return result
+
+    def get_level_prefixes(self, keys: [str], level: int) -> set:
+        """
+        Get JSON value by prefix chain in 'keys' param.
+
+        :param keys:
+        :param level:
+        """
+
+        key_prefix = self._create_key(keys)
+        result = []
+        for key in self.cache:
+            split = key.split(self.separator)
+            if len(split) > level and key.startswith(key_prefix):
+                result.append(split[level])
+        return set(result)
+
+
+class ThreadSafeCacheResultService(CacheResultService):
+    def __init__(self, filename='result.json', separator=':', cache=None, lock=None):
+        super().__init__(filename=filename, separator=separator)
+        self.filename = filename
+        self.separator = separator
+        self.cache = cache
+        self.lock = lock
+
+    def flush(self):
+        """
+        Flush data to persisted store.
+        """
+
+        with self.lock:
+            cache_dict = dict(self.cache)
+            write_json(self.filename, cache_dict)
+
+    def put(self, key: str, value):
+        """
+        Put object to cache_services.
+
+        :param key: cache_services key
+        :param value: cache_services value
+        """
+        with self.lock:
+            self.cache[key] = value
+
+    def put_with_level(self, keys: [str], value):
+        """
+        Put JSON value by keys chain in 'keys' param.
+
+        :param value: value to put
+        :param keys: keys chain param
+        """
+
+        key = self._create_key(keys)
+        with self.lock:
+            self.cache[key] = value
+
+    def set_filename(self, filename: str):
+        """
+        Sets filename field.
+
+        Parameters
+        ----------
+        filename : str
+            Filename.
+        """
+
+        self.filename = filename
+
+    def set_separator(self, separator: str):
+        """
+        Sets filename field.
+
+        Parameters
+        ----------
+        separator : str
+            Filename.
+        """
+
+        self.separator = separator
+
+# TODO: move to stattest/execution??

stattest/execution/data.py

@@ -20,7 +20,7 @@ def generate_rvs_data(rvs_generator: AbstractRVSGenerator, size, count=1_000):
     result = []
     for i in range(count):
         # df.loc[i] = list(rvs_generator.generate(size))
-        result.append(rvs_generator.generate(size))
+        result.append(rvs_generator._generate(size))
     # return df
     return result