sciveo 0.0.22__tar.gz → 0.0.24__tar.gz

{sciveo-0.0.22 → sciveo-0.0.24}/PKG-INFO

@@ -1,7 +1,8 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.0.22
+Version: 0.0.24
 Description-Content-Type: text/markdown
+Provides-Extra: mon
 
 # SCIVEO - ML/Scientific Experiments Management Client
 

{sciveo-0.0.22 → sciveo-0.0.24}/sciveo/api/base.py

@@ -26,10 +26,10 @@ class APIRemoteClient:
     self.headers = { "Auth-Token": os.environ['SCIVEO_SECRET_ACCESS_KEY'] }
     debug(type(self).__name__, f"base url: {self.base_url}")
 
-  def POST(self, content_type, data, timeout=30):
-    return self.POST_URL(f"sci/{content_type}/", data, timeout)
+  def POST_SCI(self, content_type, data, timeout=30):
+    return self.POST(f"sci/{content_type}/", data, timeout)
 
-  def POST_URL(self, url, data, timeout=30):
+  def POST(self, url, data, timeout=30):
     url = f"{self.base_url}{url}"
     result = False
     try:

{sciveo-0.0.22 → sciveo-0.0.24}/sciveo/api/upload.py

@@ -13,7 +13,6 @@ import os
 import json
 from urllib import request, parse
 from urllib.error import HTTPError
-import requests
 
 from sciveo.common.tools.logger import *
 from sciveo.api.base import *
@@ -30,6 +29,8 @@ class APIFileUploader:
       APIFileUploader.api = APIRemoteClient()
 
   def __call__(self):
+    import requests
+
     file_name = self.local_path.split("/")[-1]
     url_presigned_post = f"aws/s3/presigned_post/?content_type={self.content_type}&file_name={file_name}"
     presigned_post = APIFileUploader.api.GET(url_presigned_post)

{sciveo-0.0.22 → sciveo-0.0.24}/sciveo/common/optimizers.py

@@ -67,6 +67,19 @@ class BaseOptimizer:
     return delta_y, self.list_to_x(x, x_new)
 
 
+class HistoryGradientOptimizer(BaseOptimizer):
+  def __init__(self, keys, use_keys, learning_rate=0.01, learning_rate_decay=0.001):
+    super().__init__(keys, use_keys, learning_rate, learning_rate_decay)
+
+  def update(self, list_samples):
+    for i in range(len(list_samples) - 1):
+      x1, y1 = list_samples[i]
+      x2, y2 = list_samples[i + 1]
+
+      x11, x22 = self.x_to_list(x1, x2)
+      grads, delta_x, delta_y = self.gradients(x11, y1, x22, y2)
+
+
 class AdamOptimizer(BaseOptimizer):
   def __init__(self, keys, use_keys, learning_rate=0.01, learning_rate_decay=0.001, beta1=0.9, beta2=0.999, epsilon=1e-8):
     super().__init__(keys, use_keys, learning_rate, learning_rate_decay)

{sciveo-0.0.22 → sciveo-0.0.24}/sciveo/common/tools/hardware.py

@@ -40,4 +40,4 @@ class HardwareInfo:
 
       self.data["CPU"]["info"] = cpu_info
     except Exception:
-      return
+      return

{sciveo-0.0.22 → sciveo-0.0.24}/sciveo/content/experiment.py

@@ -151,7 +151,7 @@ class RemoteExperiment(Experiment):
       remote_data["project_guid"] = self.project_guid
     else:
       remote_data["project_name"] = self.project_name
-    result = self.api.POST("experiment", remote_data)
+    result = self.api.POST_SCI("experiment", remote_data)
     debug(type(self).__name__, "init", self.name, "api", result)
     if result and "error" not in result:
       if result["name"] == self.name:
@@ -168,7 +168,7 @@ class RemoteExperiment(Experiment):
       "project_guid": self.project_guid,
       "data": self.data
     }
-    result = self.api.POST("experiment", remote_data)
+    result = self.api.POST_SCI("experiment", remote_data)
     debug(type(self).__name__, "close", self.name, "api", result)
 
   def on_guid(self, guid):

{sciveo-0.0.22 → sciveo-0.0.24}/sciveo/content/project.py

@@ -75,7 +75,7 @@ class RemoteProject(ProjectBase):
     }
     if parent_id is not None:
       remote_data["parent_id"] = parent_id
-    result = self.api.POST("project", remote_data)
+    result = self.api.POST_SCI("project", remote_data)
     debug(type(self).__name__, "init api", result)
     if result and "error" not in result:
       if result["name"] == project_name:
@@ -100,7 +100,7 @@ class RemoteProject(ProjectBase):
       "guid": self.guid,
       "data": self.project_data
     }
-    result = self.api.POST("project", remote_data)
+    result = self.api.POST_SCI("project", remote_data)
     debug(type(self).__name__, "close", self.project_name, "api", result)
 
 

sciveo-0.0.24/sciveo/monitoring/monitor.py

@@ -0,0 +1,61 @@
+#
+# Pavlin Georgiev, Softel Labs
+#
+# This is a proprietary file and may not be copied,
+# distributed, or modified without express permission
+# from the owner. For licensing inquiries, please
+# contact pavlin@softel.bg.
+#
+# 2024
+#
+
+import os
+import time
+import psutil
+import numpy as np
+
+from sciveo.common.tools.logger import *
+from sciveo.common.tools.daemon import DaemonBase
+from sciveo.common.tools.hardware import HardwareInfo
+from sciveo.common.tools.formating import format_memory_size
+from sciveo.api.base import APIRemoteClient
+
+
+class BaseMonitor(DaemonBase):
+  def __init__(self, period=5):
+    super().__init__(period=period)
+    self.data = HardwareInfo()()
+    self.data.setdefault("CPU", {})
+    self.data["RAM"] = {
+      "installed": self.data["RAM"]
+    }
+    psutil.cpu_percent(interval=0.5)
+    self.api = APIRemoteClient()
+
+  def __call__(self):
+    return self.data
+
+  def loop(self):
+    self.get_cpu_usage()
+    self.get_memory()
+    debug(type(self).__name__, "loop", self())
+
+  def get_cpu_usage(self):
+    self.data["CPU"]["usage_per_core"] = psutil.cpu_percent(interval=None, percpu=True)
+    # self.data["CPU"]["usage_per_core"] = (np.array(self.data["CPU"]["usage_per_core"]) / 100.0).tolist()
+    self.data["CPU"]["usage"] = np.array(self.data["CPU"]["usage_per_core"]).mean()
+
+  def get_memory(self):
+    memory = psutil.virtual_memory()
+    self.data["RAM"]["total"] = memory.total
+    self.data["RAM"]["used"] = memory.used
+    self.data["RAM"]["free"] = memory.free
+    self.data["RAM"]["print"] = f"total: {format_memory_size(memory.total)} used: {format_memory_size(memory.used)}"
+
+
+if __name__ == "__main__":
+  mon = BaseMonitor(period=10)
+  mon.start()
+
+  while(True):
+    time.sleep(30)

sciveo-0.0.24/sciveo/version.py

@@ -0,0 +1,2 @@
+
+__version__ = '0.0.24'

{sciveo-0.0.22 → sciveo-0.0.24}/sciveo.egg-info/PKG-INFO

@@ -1,7 +1,8 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.0.22
+Version: 0.0.24
 Description-Content-Type: text/markdown
+Provides-Extra: mon
 
 # SCIVEO - ML/Scientific Experiments Management Client
 

{sciveo-0.0.22 → sciveo-0.0.24}/sciveo.egg-info/SOURCES.txt

@@ -26,6 +26,8 @@ sciveo/content/dataset.py
 sciveo/content/experiment.py
 sciveo/content/project.py
 sciveo/content/runner.py
+sciveo/monitoring/__init__.py
+sciveo/monitoring/monitor.py
 test/test_configuration.py
 test/test_runner.py
 test/test_sampling.py

sciveo-0.0.24/sciveo.egg-info/requires.txt

@@ -0,0 +1,6 @@
+numpy>=0.0.0
+requests>=0.0.0
+
+[mon]
+psutil>=0.0.0
+sciveo.monitoring

{sciveo-0.0.22 → sciveo-0.0.24}/setup.py

@@ -7,8 +7,14 @@ setup(
     packages=find_packages(),
     install_requires=[
       'numpy>=0.0.0',
-      'requests>=0.0.0'
+      'requests>=0.0.0',
     ],
     long_description=open('README.md').read(),
     long_description_content_type='text/markdown',
+    extras_require={
+      'mon': [
+        'psutil>=0.0.0',
+        'sciveo.monitoring',
+      ]
+    },
 )

sciveo-0.0.22/sciveo/version.py

@@ -1,2 +0,0 @@
-
-__version__ = '0.0.22'

sciveo-0.0.22/sciveo.egg-info/requires.txt

@@ -1,2 +0,0 @@
-numpy>=0.0.0
-requests>=0.0.0