sciveo 0.1.52__tar.gz → 0.1.53__tar.gz

{sciveo-0.1.52 → sciveo-0.1.53}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.1.52
+Version: 0.1.53
 Description-Content-Type: text/markdown
 Provides-Extra: mon
 Provides-Extra: net

{sciveo-0.1.52 → sciveo-0.1.53}/sciveo/api/predictors.py

@@ -11,9 +11,12 @@
 
 from sciveo.tools.logger import *
 from sciveo.tools.timers import Timer
+from sciveo.tools.configuration import GlobalConfiguration
 
 
 class Predictors:
+  instance = None
+
   def __init__(self, predictors=None):
     if predictors is not None:
       self.list_predictors = predictors
@@ -27,6 +30,16 @@ class Predictors:
 
     self.stats = {}
 
+  @staticmethod
+  def get():
+    if Predictors.instance is None:
+      Predictors.instance = Predictors(GlobalConfiguration.get().data.get("API_PREDICTORS", None))
+    return Predictors.instance
+
+  @staticmethod
+  def set(predictors):
+    Predictors.instance = predictors
+
   def predict(self, predictor_name, X):
     t = Timer()
     predicted = self.list_predictors[predictor_name].predict(X)
@@ -35,6 +48,14 @@ class Predictors:
     self.stats[predictor_name]["count"] += len(X)
     return predicted
 
+  def train(self, predictor_name, X, Y_true=None):
+    t = Timer()
+    result = self.list_predictors[predictor_name].train(X, Y_true)
+    self.stats.setdefault(predictor_name, {"elapsed": 0.0, "count": 0})
+    self.stats[predictor_name]["elapsed"] += t.stop()
+    self.stats[predictor_name]["count"] += len(X)
+    return result
+
   def describe(self):
     result = []
     for k, v in self.list_predictors.items():

{sciveo-0.1.52 → sciveo-0.1.53}/sciveo/api/server.py

@@ -26,8 +26,6 @@ CONFIG = GlobalConfiguration.get()
 SCI_API_AUTH_TOKEN = CONFIG["api_auth_token"]
 SCI_API_PREFIX = CONFIG["api_prefix"]
 
-API_PREDICTORS = Predictors(CONFIG.data.get("API_PREDICTORS", None))
-API_PREDICTORS.print()
 
 app = Flask(__name__)
 
@@ -49,7 +47,7 @@ def predict_endpoint():
       data = request.json
       if "predictor" in data and "X" in data:
         t = Timer()
-        predicted = API_PREDICTORS.predict(data["predictor"], data["X"])
+        predicted = Predictors.get().predict(data["predictor"], data["X"])
 
         if data.get("compressed", 0) > 0:
           predicted = CompressJsonData().compress(predicted)
@@ -67,11 +65,16 @@ def predict_endpoint():
 
 
 class WebServerDaemon(DaemonBase):
-  def __init__(self, host="0.0.0.0", port=8901):
+  def __init__(self, host="0.0.0.0", port=8901, predictors=None):
     super().__init__()
     self.host = host
     self.port = port
 
+    if predictors is not None:
+      Predictors.set(predictors)
+
   def run(self):
     info("run", [self.host, self.port])
+    Predictors.get().print()
+
     serve(app, host=self.host, port=self.port)

sciveo-0.1.53/sciveo/version.py

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

{sciveo-0.1.52 → sciveo-0.1.53}/sciveo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.1.52
+Version: 0.1.53
 Description-Content-Type: text/markdown
 Provides-Extra: mon
 Provides-Extra: net

sciveo-0.1.52/sciveo/version.py

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