jaseci 1.4.2.4__tar.gz → 1.4.2.6__tar.gz

{jaseci-1.4.2.4 → jaseci-1.4.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jaseci
-Version: 1.4.2.4
+Version: 1.4.2.6
 Home-page: https://github.com/Jaseci-Labs/jaseci
 Author: Jason Mars
 Author-email: jason@jaseci.org
@@ -12,7 +12,8 @@ Requires-Dist: antlr4-python3-runtime<4.10.0,>=4.9.3
 Requires-Dist: fastapi[all]<1.0.0,>=0.75.0
 Requires-Dist: requests
 Requires-Dist: redis
-Requires-Dist: celery<6,>=5
+Requires-Dist: kombu==5.3.1
+Requires-Dist: celery==5.3.1
 Requires-Dist: flake8
 Requires-Dist: pep8-naming
 Requires-Dist: stripe
@@ -20,7 +21,7 @@ Requires-Dist: pydantic<2.0.0
 Requires-Dist: docstring-parser
 Requires-Dist: prometheus_api_client==0.5.1
 Requires-Dist: prometheus-client==0.14.1
-Requires-Dist: kubernetes==23.6.0
+Requires-Dist: kubernetes==21.7.0
 Requires-Dist: pytest
 Requires-Dist: pytest-xdist
 Requires-Dist: pytest-cov
@@ -32,4 +33,6 @@ Requires-Dist: beautifulsoup4<4.13.0,>=4.12.2
 Requires-Dist: lxml<4.10.0,>=4.9.2
 Requires-Dist: html5lib<1.2,>=1.1
 Requires-Dist: prettytable<3.8.0,>=3.7.0
-Requires-Dist: apache-libcloud==3.7.0
+Requires-Dist: apache-libcloud==3.8.0
+Requires-Dist: azure-storage-blob==12.17.0
+Requires-Dist: python-magic==0.4.27

jaseci-1.4.2.6/jaseci/VERSION

@@ -0,0 +1 @@
+1.4.2.6

{jaseci-1.4.2.4 → jaseci-1.4.2.6}/jaseci/cli_tools/book_tools.py

@@ -205,11 +205,11 @@ class Book:
                     auth_level = (
                         "public"
                         if j in Sm._public_api
-                        else "user"
-                        if j in Sm._private_api
-                        else "admin"
-                        if j in Sm._admin_api
-                        else "cli_only"
+                        else (
+                            "user"
+                            if j in Sm._private_api
+                            else "admin" if j in Sm._admin_api else "cli_only"
+                        )
                     )
                     break
             if not found:
@@ -438,11 +438,11 @@ class modifiedBook:
                     auth_level = (
                         "public"
                         if j in Sm._public_api
-                        else "user"
-                        if j in Sm._private_api
-                        else "admin"
-                        if j in Sm._admin_api
-                        else "cli_only"
+                        else (
+                            "user"
+                            if j in Sm._private_api
+                            else "admin" if j in Sm._admin_api else "cli_only"
+                        )
                     )
                     break
             if not found:

{jaseci-1.4.2.4 → jaseci-1.4.2.6}/jaseci/extens/act_lib/date.py

@@ -1,4 +1,5 @@
 """Built in actions for Jaseci"""
+
 from datetime import datetime, timedelta
 from jaseci.jsorc.live_actions import jaseci_action
 from dateutil.relativedelta import relativedelta

{jaseci-1.4.2.4 → jaseci-1.4.2.6}/jaseci/extens/act_lib/file.py

@@ -1,4 +1,5 @@
 """Built in actions for Jaseci"""
+
 from jaseci.jsorc.live_actions import jaseci_action
 import os
 import json

{jaseci-1.4.2.4 → jaseci-1.4.2.6}/jaseci/extens/act_lib/file_handler.py

@@ -1,6 +1,9 @@
 """Built in actions for Jaseci"""
-import mimetypes
 
+import mimetypes
+import magic
+from os import path
+from urllib.parse import urlparse
 from requests import get
 from jaseci.jsorc.live_actions import jaseci_action
 
@@ -172,14 +175,16 @@ def download(url: str, header: dict = {}, meta: dict = {}):
     """Standard built in for download file from url"""
     from jaseci.utils.file_handler import FileHandler
 
-    tmp = FileHandler("tmp")
+    tmp = FileHandler(path.basename(urlparse(url).path) or "file")
     meta["h"].add_file_handler(tmp)
 
     with get(url, stream=True, headers=header) as res:
         res.raise_for_status()
-        tmp.open("wb")
+        tmp.open("wb+")
         for chunk in res.iter_content(chunk_size=8192):
             tmp.buffer.write(chunk)
+
+        tmp.content_type = magic.from_buffer(tmp.read(0), mime=True)
         tmp.close()
 
     return tmp.id

{jaseci-1.4.2.4 → jaseci-1.4.2.6}/jaseci/extens/act_lib/internal.py

@@ -1,4 +1,5 @@
 """Built in actions for Jaseci"""
+
 from jaseci.jsorc.live_actions import jaseci_action
 from jaseci.utils.utils import perf_test_start, perf_test_stop
 

{jaseci-1.4.2.4 → jaseci-1.4.2.6}/jaseci/extens/act_lib/jaseci.py

@@ -1,4 +1,5 @@
 """Built in actions for Jaseci"""
+
 from jaseci.jsorc.live_actions import jaseci_action
 from jaseci.utils.utils import master_from_meta, copy_func
 from jaseci.prim.super_master import SuperMaster

{jaseci-1.4.2.4 → jaseci-1.4.2.6}/jaseci/extens/act_lib/net.py

@@ -7,6 +7,7 @@ accept lists that are exclusively composed of instances of defined
 architype node and/or edges. Keep in mind that a \\lstinline{jac_set}
 is simply a list that only contains such elements.
 """
+
 from jaseci.jsorc.live_actions import jaseci_action
 from jaseci.utils.utils import master_from_meta
 from jaseci.jac.jac_set import JacSet

{jaseci-1.4.2.4 → jaseci-1.4.2.6}/jaseci/extens/act_lib/rand.py

@@ -1,4 +1,5 @@
 """Built in actions for Jaseci"""
+
 import random
 
 # import faker

{jaseci-1.4.2.4 → jaseci-1.4.2.6}/jaseci/extens/act_lib/request.py

@@ -1,4 +1,5 @@
 """Built in actions for Jaseci"""
+
 import requests
 from jaseci.jsorc.live_actions import jaseci_action
 

{jaseci-1.4.2.4 → jaseci-1.4.2.6}/jaseci/extens/act_lib/std.py

@@ -1,4 +1,5 @@
 """Built in actions for Jaseci"""
+
 from operator import itemgetter
 from jaseci.utils.utils import app_logger, json_out
 from datetime import datetime
@@ -111,9 +112,8 @@ def actload_local(filename: str, meta):
     """
     mast = master_from_meta(meta)
     if not mast.is_master(super_check=True, silent=True):
-        meta["interp"].rt_error(
-            "Only super master can load actions.", meta["interp"]._cur_jac_ast
-        )
+        raise Exception("Only super master can load actions.")
+
     return mast.actions_load_local(file=filename)["success"]
 
 
@@ -229,3 +229,8 @@ def log_activity(
     activity = elastic.generate_from_meta(meta, log, action)
 
     return elastic.doc_activity(activity, query, suffix)
+
+
+@jaseci_action()
+def clear_cache(all: bool = True, meta: dict = {}):
+    meta["h"].clear_cache(all)

{jaseci-1.4.2.4 → jaseci-1.4.2.6}/jaseci/extens/act_lib/storage.py

@@ -23,6 +23,12 @@ def download(file: str, provider: str = None, container: str = None, meta: dict
     return meta["h"].add_file_handler(storage().download(file, provider, container))
 
 
+@jaseci_action()
+def cdn_url(file: str, provider: str = None, container: str = None, **kwargs):
+    """temp"""
+    return storage().cdn_url(file, provider, container, **kwargs)
+
+
 @jaseci_action()
 def delete(file: str, provider: str = None, container: str = None):
     """temp"""

{jaseci-1.4.2.4 → jaseci-1.4.2.6}/jaseci/extens/act_lib/stripe.py

@@ -1,4 +1,5 @@
 """Built in actions for Jaseci"""
+
 import stripe as s
 
 from jaseci.jsorc.jsorc import JsOrc

{jaseci-1.4.2.4 → jaseci-1.4.2.6}/jaseci/extens/act_lib/task.py

@@ -1,4 +1,5 @@
 """Built in actions for Jaseci"""
+
 from jaseci.jsorc.jsorc import JsOrc
 from jaseci.jsorc.live_actions import jaseci_action
 from jaseci.extens.svc.task_svc import TaskService

{jaseci-1.4.2.4 → jaseci-1.4.2.6}/jaseci/extens/act_lib/tests/test_file.py

@@ -52,26 +52,11 @@ class FileTest(CoreTest):
         self.assertEqual(
             {
                 "id": f"{uuid}",
-                "name": "tmp",
-                "content_type": None,
-                "field": None,
-                "absolute_name": f"{uuid}-tmp",
-                "absolute_path": f"/tmp/{uuid}-tmp",
-                "persist": False,
-            },
-            reps[1],
-        )
-
-        reps = self.call_walker("download_file")
-        uuid = reps[0]
-        self.assertEqual(
-            {
-                "id": f"{uuid}",
-                "name": "tmp",
-                "content_type": None,
+                "name": "jaseci_bible.pdf",
+                "content_type": "application/pdf",
                 "field": None,
-                "absolute_name": f"{uuid}-tmp",
-                "absolute_path": f"/tmp/{uuid}-tmp",
+                "absolute_name": f"{uuid}-jaseci_bible.pdf",
+                "absolute_path": f"/tmp/{uuid}-jaseci_bible.pdf",
                 "persist": False,
             },
             reps[1],
@@ -84,11 +69,11 @@ class FileTest(CoreTest):
         self.assertEqual(
             {
                 "id": f"{uuid}",
-                "name": "tmp",
-                "content_type": None,
+                "name": "jaseci_bible.pdf",
+                "content_type": "application/pdf",
                 "field": None,
-                "absolute_name": f"{uuid}-tmp",
-                "absolute_path": f"/tmp/{uuid}-tmp",
+                "absolute_name": f"{uuid}-jaseci_bible.pdf",
+                "absolute_path": f"/tmp/{uuid}-jaseci_bible.pdf",
                 "persist": False,
             },
             reps,
@@ -104,8 +89,8 @@ class FileTest(CoreTest):
                 "name": "jaseci_bible.pdf",
                 "content_type": "application/pdf",
                 "field": None,
-                "absolute_name": f"{uuid}-tmp",
-                "absolute_path": f"/tmp/{uuid}-tmp",
+                "absolute_name": f"{uuid}-jaseci_bible.pdf",
+                "absolute_path": f"/tmp/{uuid}-jaseci_bible.pdf",
                 "persist": False,
             },
             reps,
@@ -126,6 +111,6 @@ class FileTest(CoreTest):
         self.assertEqual({"test": 1}, kwargs["data"])
         self.assertEqual({"test": 2}, kwargs["headers"])
         self.assertEqual("file", kwargs["files"][0][0])
-        self.assertEqual("tmp", kwargs["files"][0][1][0])
+        self.assertEqual("jaseci_bible.pdf", kwargs["files"][0][1][0])
         self.assertIsInstance(kwargs["files"][0][1][1], BufferedReader)
-        self.assertIsNone(kwargs["files"][0][1][2])
+        self.assertEqual("application/pdf", kwargs["files"][0][1][2])

{jaseci-1.4.2.4 → jaseci-1.4.2.6}/jaseci/extens/act_lib/url.py

@@ -1,4 +1,5 @@
 """Built in actions for Jaseci"""
+
 from jaseci.jsorc.live_actions import jaseci_action
 from fastapi import HTTPException
 import base64

{jaseci-1.4.2.4 → jaseci-1.4.2.6}/jaseci/extens/act_lib/vector.py

@@ -1,4 +1,5 @@
 """Built in actions for Jaseci"""
+
 import numpy as np
 from operator import itemgetter
 import pickle, base64

{jaseci-1.4.2.4 → jaseci-1.4.2.6}/jaseci/extens/act_lib/webtool.py

@@ -1,11 +1,12 @@
 """Built in actions for Jaseci"""
+
 import requests
 from jaseci.jsorc.live_actions import jaseci_action
 from bs4 import BeautifulSoup
 
 
 @jaseci_action()
-def get_page_meta(url: str, timeout: int = 3, parser: str = "lxml"):
+def get_page_meta(url: str, timeout: int = 3, parser: str = "lxml", headers: dict = {}):
     """
     Util to parse metadata out of urls and html documents
     Parser option: lxml (default), html5lib, html.parser
@@ -15,9 +16,7 @@ def get_page_meta(url: str, timeout: int = 3, parser: str = "lxml"):
         webpage = requests.get(
             url,
             timeout=timeout,
-            headers={
-                "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:94.0) Gecko/20100101 Firefox/94.0"
-            },
+            headers=headers,
         )
         soup = BeautifulSoup(webpage.content, features=parser)
         meta = soup.find_all("meta")

{jaseci-1.4.2.4 → jaseci-1.4.2.6}/jaseci/extens/act_lib/zip.py

@@ -1,4 +1,5 @@
 """Built in actions for Jaseci"""
+
 from jaseci.jsorc.live_actions import jaseci_action
 from jaseci.utils.utils import print_stack_to_log
 from base64 import b64decode, b64encode

{jaseci-1.4.2.4 → jaseci-1.4.2.6}/jaseci/extens/api/actions_api.py

@@ -1,6 +1,7 @@
 """
 Admin Global api functions as a mixin
 """
+
 from jaseci.extens.api.interface import Interface
 import jaseci.jsorc.live_actions as lact
 import json

{jaseci-1.4.2.4 → jaseci-1.4.2.6}/jaseci/extens/api/alias_api.py

@@ -1,6 +1,7 @@
 """
 Alias api as a mixin
 """
+
 from jaseci.extens.api.interface import Interface
 
 

{jaseci-1.4.2.4 → jaseci-1.4.2.6}/jaseci/extens/api/architype_api.py

@@ -1,6 +1,7 @@
 """
 Architype api functions as a mixin
 """
+
 from jaseci.extens.api.interface import Interface
 from jaseci.prim.architype import Architype
 from jaseci.prim.sentinel import Sentinel

{jaseci-1.4.2.4 → jaseci-1.4.2.6}/jaseci/extens/api/global_api.py

@@ -1,6 +1,7 @@
 """
 Admin Global api functions as a mixin
 """
+
 from jaseci.extens.api.interface import Interface
 from jaseci.prim.sentinel import Sentinel
 import uuid

{jaseci-1.4.2.4 → jaseci-1.4.2.6}/jaseci/extens/api/graph_api.py

@@ -1,6 +1,7 @@
 """
 Graph api functions as a mixin
 """
+
 from jaseci.extens.api.interface import Interface
 from jaseci.utils.id_list import IdList
 from jaseci.prim.graph import Graph

jaseci-1.4.2.6/jaseci/extens/api/health_api.py

@@ -0,0 +1,21 @@
+"""
+Health APIs
+"""
+
+from jaseci.jsorc.jsorc import JsOrc
+from jaseci.extens.api.interface import Interface
+
+
+class HealthApi:
+    """
+    API for readiness probe
+    """
+
+    @Interface.public_api(allowed_methods=["get"])
+    def health(self):
+        """
+        readiness probe
+        """
+        # to update
+        # we might need to return some other information here
+        return JsOrc.__running__

{jaseci-1.4.2.4 → jaseci-1.4.2.6}/jaseci/extens/api/interface.py

@@ -1,6 +1,7 @@
 """
 General master interface engine for client interfaces as mixin
 """
+
 from inspect import signature, getdoc
 from jaseci.utils.utils import logger, is_jsonable, is_true, exc_stack_as_str_list
 from jaseci.prim.element import Element

{jaseci-1.4.2.4 → jaseci-1.4.2.6}/jaseci/extens/api/jac_api.py

@@ -1,6 +1,7 @@
 """
 Jac tools api functions as a mixin
 """
+
 from copy import deepcopy
 import json
 import os

{jaseci-1.4.2.4 → jaseci-1.4.2.6}/jaseci/extens/api/jsorc_api.py

@@ -1,6 +1,7 @@
 """
 JSORC APIs
 """
+
 import json
 from json import dumps
 from time import time
@@ -118,16 +119,14 @@ class JsOrcApi:
         """
 
         # will throw exception if not existing
-        svc = JsOrc.svc(name)
+        return JsOrc.svc(name).info()
 
-        return {
-            "enabled": svc.enabled,
-            "automated": svc.automated,
-            "quiet": svc.quiet,
-            "state": svc.state.name,
-            "config": svc.config,
-            "error": str(svc.error) if svc.error else None,
-        }
+    @Interface.admin_api(cli_args=["name"])
+    def service_config_set(self, name: str, config: dict):
+        """
+        Set a service config
+        """
+        return JsOrc.svc_conf_set(name, config, self._h)
 
     @Interface.admin_api(cli_args=["name"])
     def service_refresh(self, name: str):

{jaseci-1.4.2.4 → jaseci-1.4.2.6}/jaseci/extens/api/logger_api.py

@@ -1,6 +1,7 @@
 """
 Logger api as a mixin
 """
+
 import re
 from jaseci.extens.api.interface import Interface
 from jaseci.utils.log_utils import parse_logs

{jaseci-1.4.2.4 → jaseci-1.4.2.6}/jaseci/extens/api/master_api.py

@@ -1,6 +1,7 @@
 """
 Master api as a mixin
 """
+
 from jaseci.extens.api.interface import Interface
 from jaseci.utils.id_list import IdList
 import uuid
@@ -72,7 +73,7 @@ class MasterApi:
     def master_active_set(self, name: str):
         """
         Sets the default master master should use
-        NOTE: Specail handler included in general_interface_to_api
+        NOTE: Special handler included in general_interface_to_api
         """
         mas = self.sub_master_ids.get_obj_by_name(name)
         if not mas:

{jaseci-1.4.2.4 → jaseci-1.4.2.6}/jaseci/extens/api/object_api.py

@@ -1,6 +1,7 @@
 """
 Object api as a mixin
 """
+
 from jaseci.extens.api.interface import Interface
 from jaseci.prim.element import Element
 

{jaseci-1.4.2.4 → jaseci-1.4.2.6}/jaseci/extens/api/prometheus_api.py

@@ -1,6 +1,7 @@
 """
 Prometheus APIs
 """
+
 from jaseci.extens.api.interface import Interface
 from jaseci.jsorc.jsorc import JsOrc
 from jaseci.extens.svc.prome_svc import PrometheusService

{jaseci-1.4.2.4 → jaseci-1.4.2.6}/jaseci/extens/api/queue_api.py

@@ -1,6 +1,7 @@
 """
 Queue api functions as a mixin
 """
+
 from jaseci.extens.api.interface import Interface
 from jaseci.jsorc.jsorc import JsOrc
 from jaseci.extens.svc.task_svc import TaskService

{jaseci-1.4.2.4 → jaseci-1.4.2.6}/jaseci/extens/api/sentinel_api.py

@@ -1,6 +1,7 @@
 """
 Sentinel api functions as a mixin
 """
+
 from jaseci.extens.api.interface import Interface
 from jaseci.utils.id_list import IdList
 from jaseci.prim.sentinel import Sentinel

jaseci-1.4.2.6/jaseci/extens/api/share_api.py

@@ -0,0 +1,64 @@
+"""
+Object sharing APIs
+"""
+from jaseci.extens.api.interface import Interface
+from jaseci.prim.element import Element
+
+
+class ShareApi:
+    """
+    Sharing APIs.
+    """
+
+    def __init__(self):
+        self.incoming = {}
+
+    @Interface.private_api()
+    def share_object(
+        self, receiver: str, objs: list[Element] = [], read_only: bool = True
+    ):
+        """
+        Sharing an object with a user
+        obj: The list of elements to share
+        receiver: master of the receiving user
+        read_only: if set true, the object shared will be shared as read-only
+        """
+        # Get the master object by id
+        receiver_mast = self._h.get_obj(
+            caller_id=self.jid, item_id=receiver, override=True
+        )
+
+        for obj in objs:
+            # Grant read-only permission to the new user
+            self.object_perms_grant(obj, receiver_mast, read_only=read_only)
+            obj.save()
+
+            # Add the objet id to the receiver's incoming list
+            receiver_mast.incoming[str(obj.id)] = {"jid": self.jid, "name": self.name}
+
+        receiver_mast.save()
+        self.save()
+
+        return {
+            "objects": [str(obj) for obj in objs],
+            "sharer": str(self),
+            "receiver": str(receiver_mast),
+        }
+
+    @Interface.private_api()
+    def share_incoming_pop(self, obj_id: str):
+        """
+        Remove an item from the incoming list
+        """
+        try:
+            self.incoming.pop(obj_id)
+            return True
+        except Exception:
+            return None
+
+    @Interface.private_api()
+    def share_incoming_list(self):
+        """
+        Get the incoming objects
+        """
+        return self.incoming

{jaseci-1.4.2.4 → jaseci-1.4.2.6}/jaseci/extens/api/super_api.py

@@ -1,6 +1,7 @@
 """
 Super (master) api as a mixin
 """
+
 from jaseci.extens.api.interface import Interface
 from jaseci.prim.master import Master
 

{jaseci-1.4.2.4 → jaseci-1.4.2.6}/jaseci/extens/api/user_api.py

@@ -1,6 +1,7 @@
 """
 User API
 """
+
 from jaseci.extens.api.interface import Interface
 from jaseci.jsorc.jsorc import JsOrc
 
@@ -142,3 +143,24 @@ class UserApi:
         Permanently delete master with given id
         """
         pass
+
+    @Interface.private_api()
+    def user_search(
+        self,
+        name: str,
+        detailed: bool = False,
+        create_if_not_exist: bool = False,
+        create_fields: dict = {},
+    ):
+        """
+        Search for user and returns its master jid.
+        Create new one if the user doesn't already exist, optionally.
+        create_fields will be forwarded to the user create endpoint, including
+            password
+            global_init
+            global_init_ctx
+            other_fields
+            send_email
+        See the user_create API for more details.
+        """
+        pass

{jaseci-1.4.2.4 → jaseci-1.4.2.6}/jaseci/extens/api/walker_api.py

@@ -1,6 +1,7 @@
 """
 Walker api functions as a mixin
 """
+
 from jaseci.extens.api.interface import Interface
 from jaseci.prim.walker import Walker
 from jaseci.prim.node import Node

{jaseci-1.4.2.4 → jaseci-1.4.2.6}/jaseci/extens/api/webhook_api.py

@@ -1,6 +1,7 @@
 """
 Webhook API
 """
+
 from jaseci.extens.api.interface import Interface
 from fastapi import HTTPException
 from jaseci.jsorc.jsorc import JsOrc
@@ -55,9 +56,11 @@ class WebhookApi:
             )
             sentinel = self._h.get_obj(
                 master_id,
-                self._h.get_glob("GLOB_SENTINEL")
-                if sentinel_id == "global"
-                else sentinel_id,
+                (
+                    self._h.get_glob("GLOB_SENTINEL")
+                    if sentinel_id == "global"
+                    else sentinel_id
+                ),
             )
 
             payload = {"event": req_body}