sciveo 0.1.51__tar.gz → 0.1.52__tar.gz

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

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.1.51
+Version: 0.1.52
 Description-Content-Type: text/markdown
 Provides-Extra: mon
 Provides-Extra: net
+Provides-Extra: server
 Provides-Extra: media
-Provides-Extra: media-server
 Provides-Extra: media-ml
 Provides-Extra: all
 Provides-Extra: media-all

sciveo-0.1.52/sciveo/api/predictors.py

@@ -0,0 +1,46 @@
+#
+# 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.
+#
+# 2023
+#
+
+from sciveo.tools.logger import *
+from sciveo.tools.timers import Timer
+
+
+class Predictors:
+  def __init__(self, predictors=None):
+    if predictors is not None:
+      self.list_predictors = predictors
+    else:
+      from sciveo.ml.images.embeddings import ImageEmbedding
+      from sciveo.ml.nlp.embeddings import TextEmbedding
+      self.list_predictors = {
+        "TextEmbedding": TextEmbedding(),
+        "ImageEmbedding": ImageEmbedding(),
+      }
+
+    self.stats = {}
+
+  def predict(self, predictor_name, X):
+    t = Timer()
+    predicted = self.list_predictors[predictor_name].predict(X)
+    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 predicted
+
+  def describe(self):
+    result = []
+    for k, v in self.list_predictors.items():
+      result.append([k, v.describe(), self.stats.get(k, "")])
+    return result
+
+  def print(self):
+    for k, v in self.list_predictors.items():
+      info("predictor", k, v.describe())

sciveo-0.1.52/sciveo/api/server.py

@@ -0,0 +1,77 @@
+#
+# 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.
+#
+# 2023
+#
+
+import os
+import time
+from flask import Flask, jsonify, render_template, request, url_for, Response, abort
+from waitress import serve
+
+from sciveo.tools.logger import *
+from sciveo.tools.daemon import DaemonBase
+from sciveo.tools.timers import Timer
+from sciveo.tools.compress import CompressJsonData
+from sciveo.tools.configuration import GlobalConfiguration
+from sciveo.api.predictors import Predictors
+
+
+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__)
+
+
+def authenticate():
+  token = request.headers.get('Authorization')
+  if token != f"Bearer {SCI_API_AUTH_TOKEN}":
+    abort(401, 'Unauthorized')
+
+@app.before_request
+def before_request_func():
+  authenticate()
+
+@app.route(f'/{SCI_API_PREFIX}/predict', methods=['POST'])
+def predict_endpoint():
+  result = {"error": "invalid data"}
+  try:
+    if request.is_json:
+      data = request.json
+      if "predictor" in data and "X" in data:
+        t = Timer()
+        predicted = API_PREDICTORS.predict(data["predictor"], data["X"])
+
+        if data.get("compressed", 0) > 0:
+          predicted = CompressJsonData().compress(predicted)
+
+        result = {
+          data["predictor"]: predicted,
+          "stats": {
+            "elapsed": t.stop(),
+            "count": len(data["X"])
+          }
+        }
+  except Exception as e:
+    exception("predict_endpoint", e)
+  return jsonify(result)
+
+
+class WebServerDaemon(DaemonBase):
+  def __init__(self, host="0.0.0.0", port=8901):
+    super().__init__()
+    self.host = host
+    self.port = port
+
+  def run(self):
+    info("run", [self.host, self.port])
+    serve(app, host=self.host, port=self.port)

{sciveo-0.1.51 → sciveo-0.1.52}/sciveo/cli.py

@@ -26,7 +26,7 @@ def main():
   parser.add_argument(
     'command',
     choices=[
-      'init', 'monitor', 'scan', 'nvr',
+      'init', 'monitor', 'scan', 'nvr', 'predictors-server',
       'media-server', 'media-run',
       'watchdog'
     ],
@@ -99,6 +99,17 @@ def main():
       daemon.start()
     while(True):
       time.sleep(3600)
+  elif args.command == 'predictors-server':
+    GlobalConfiguration.set("API_PREDICTORS", None)
+    from sciveo.api.server import WebServerDaemon
+    daemons = [
+      WebServerDaemon(port=args.port)
+    ]
+    for daemon in daemons:
+      debug("starting", type(daemon).__name__)
+      daemon.start()
+    while(True):
+      time.sleep(3600)
   else:
     warning(args.command, "not implemented")
 

{sciveo-0.1.51 → sciveo-0.1.52}/sciveo/media/tools/nvr.py

@@ -10,6 +10,7 @@
 #
 
 import os
+import shutil
 import subprocess as sp
 import time
 import re
@@ -131,7 +132,7 @@ class VideoRecorder:
 
     debug("MV", file_path, "=>", video_file_path)
     os.makedirs(video_base_path, exist_ok=True)
-    os.rename(file_path, video_file_path)
+    shutil.move(file_path, video_file_path)
 
   def clean_old_videos(self):
     try:

{sciveo-0.1.51 → sciveo-0.1.52}/sciveo/ml/nlp/embeddings.py

@@ -23,7 +23,6 @@ import numpy as np
 import pandas as pd
 
 from transformers import AutoTokenizer, AutoModel
-from sentence_transformers import SentenceTransformer
 
 from sciveo.tools.logger import *
 from sciveo.ml.base import BaseML
@@ -140,6 +139,7 @@ class SentenceEmbedding(TextEmbedding):
 
   def init(self):
     if self.model is None:
+      from sentence_transformers import SentenceTransformer
       self.model = SentenceTransformer(self.model_name).to(self.device)
       self.post_init()
 

{sciveo-0.1.51 → sciveo-0.1.52}/sciveo/tools/configuration.py

@@ -41,6 +41,11 @@ class GlobalConfiguration:
         GlobalConfiguration.config = GlobalConfiguration(name)
       return GlobalConfiguration.config
 
+  @staticmethod
+  def set(k, v):
+    with GlobalConfiguration.lock_config:
+      GlobalConfiguration.config.data[k] = v
+
   def __getitem__(self, key):
     key = key.lower()
     return self.data.get(key, self.default.get(key, None))

sciveo-0.1.52/sciveo/version.py

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

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

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.1.51
+Version: 0.1.52
 Description-Content-Type: text/markdown
 Provides-Extra: mon
 Provides-Extra: net
+Provides-Extra: server
 Provides-Extra: media
-Provides-Extra: media-server
 Provides-Extra: media-ml
 Provides-Extra: all
 Provides-Extra: media-all

{sciveo-0.1.51 → sciveo-0.1.52}/sciveo.egg-info/SOURCES.txt

@@ -11,6 +11,8 @@ sciveo.egg-info/requires.txt
 sciveo.egg-info/top_level.txt
 sciveo/api/__init__.py
 sciveo/api/base.py
+sciveo/api/predictors.py
+sciveo/api/server.py
 sciveo/api/upload.py
 sciveo/common/__init__.py
 sciveo/common/configuration.py

{sciveo-0.1.51 → sciveo-0.1.52}/sciveo.egg-info/requires.txt

@@ -46,8 +46,10 @@ tqdm>=0.0.0
 ffmpeg-python>=0.0.0
 opencv-python-headless>=0.0.0
 opencv-contrib-python-headless>=0.0.0
-fastapi
-uvicorn[standard]
+fastapi>=0.0.0
+uvicorn[standard]>=0.0.0
+flask>=0.0.0
+waitress>=0.0.0
 tensorflow>=0.0.0
 keras>=0.0.0
 torch>=0.0.0
@@ -71,13 +73,15 @@ accelerate>=0.0.0
 annoy>=0.0.0
 ultralytics>=0.0.0
 
-[media-server]
-fastapi
-uvicorn[standard]
-
 [mon]
 psutil>=0.0.0
 
 [net]
 netifaces>=0.0.0
 scapy>=0.0.0
+
+[server]
+fastapi>=0.0.0
+uvicorn[standard]>=0.0.0
+flask>=0.0.0
+waitress>=0.0.0

{sciveo-0.1.51 → sciveo-0.1.52}/setup.py

@@ -20,12 +20,17 @@ extras_require = {
         'netifaces>=0.0.0',
         'scapy>=0.0.0',
       ],
+      'server': [
+        'fastapi>=0.0.0',
+        'uvicorn[standard]>=0.0.0',
+        'flask>=0.0.0',
+        'waitress>=0.0.0',
+      ],
       'media': [
         'scikit-learn>=0.0.0', 'scipy>=0.0.0', 'scikit-video>=0.0.0', 'scikit-image>=0.0.0', 'pycryptodome>=0.0.0', 'exifread>=0.0.0', 'qrcode[pil]>=0.0.0',
         'boto3', 'pandas>=0.0.0', 'pika>=0.0.0', 'regex>=0.0.0', 'matplotlib>=0.0.0', 'joblib>=0.0.0', 'tqdm>=0.0.0',
         'ffmpeg-python>=0.0.0', 'opencv-python-headless>=0.0.0', 'opencv-contrib-python-headless>=0.0.0',
       ],
-      'media-server': ['fastapi', 'uvicorn[standard]'],
       'media-ml': [
         'tensorflow>=0.0.0', 'keras>=0.0.0',
         'torch>=0.0.0', 'torchvision>=0.0.0',
@@ -35,7 +40,7 @@ extras_require = {
 }
 
 extras_require['all'] = extras_require['mon'] + extras_require['net']
-extras_require['media-all'] = extras_require['all'] + extras_require['media'] + extras_require['media-server'] + extras_require['media-ml']
+extras_require['media-all'] = extras_require['all'] + extras_require['media'] + extras_require['server'] + extras_require['media-ml']
 
 setup(
     name='sciveo',

sciveo-0.1.51/sciveo/version.py

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