autonomous-app 0.3.0__tar.gz → 0.3.2__tar.gz

{autonomous_app-0.3.0 → autonomous_app-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: autonomous-app
-Version: 0.3.0
+Version: 0.3.2
 Summary: Containerized application framework built on Flask with additional libraries and tools for rapid development of web applications.
 Author-email: Steven A Moore <samoore@binghamton.edu>
 License: MIT License
@@ -34,9 +34,9 @@ License-File: LICENSE
 Requires-Dist: Flask
 Requires-Dist: setuptools
 Requires-Dist: python-dotenv
+Requires-Dist: blinker
 Requires-Dist: PyGithub
 Requires-Dist: pygit2
-Requires-Dist: mongoengine
 Requires-Dist: pillow
 Requires-Dist: redis
 Requires-Dist: jsmin

{autonomous_app-0.3.0 → autonomous_app-0.3.2}/requirements.txt

@@ -12,12 +12,12 @@ Flask
 
 setuptools
 python-dotenv
+blinker
 
 ##### Storage #####
 
 PyGithub
 pygit2
-mongoengine
 pillow
 redis
 

{autonomous_app-0.3.0 → autonomous_app-0.3.2}/src/autonomous/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.3.00"
+__version__ = "0.3.2"
 
 from dotenv import load_dotenv
 

{autonomous_app-0.3.0 → autonomous_app-0.3.2}/src/autonomous/ai/audioagent.py

@@ -6,7 +6,7 @@ from .models.openai import OpenAIModel
 
 
 class AudioAgent(AutoModel):
-    client = ReferenceAttr()
+    client = ReferenceAttr(choices=[OpenAIModel])
     name = StringAttr(default="audioagent")
     instructions = StringAttr(
         default="You are highly skilled AI trained to assist with generating audio files."

{autonomous_app-0.3.0 → autonomous_app-0.3.2}/src/autonomous/ai/imageagent.py

@@ -5,7 +5,7 @@ from .models.openai import OpenAIModel
 
 
 class ImageAgent(AutoModel):
-    client = ReferenceAttr()
+    client = ReferenceAttr(choices=[OpenAIModel])
     name = StringAttr(default="imageagent")
     instructions = StringAttr(
         default="You are highly skilled AI trained to assist with generating images."

{autonomous_app-0.3.0 → autonomous_app-0.3.2}/src/autonomous/ai/jsonagent.py

@@ -7,7 +7,7 @@ from .models.openai import OpenAIModel
 
 
 class JSONAgent(AutoModel):
-    client = ReferenceAttr()
+    client = ReferenceAttr(choices=[OpenAIModel])
     name = StringAttr(default="jsonagent")
     instructions = StringAttr(
         default="You are highly skilled AI trained to assist with generating JSON formatted data."

{autonomous_app-0.3.0 → autonomous_app-0.3.2}/src/autonomous/ai/models/openai.py

@@ -4,6 +4,7 @@ import random
 import time
 from base64 import b64decode
 
+import openai
 from openai import NotFoundError as openai_NotFoundError
 from openai import OpenAI
 
@@ -14,9 +15,9 @@ from autonomous.model.automodel import AutoModel
 
 class OpenAIModel(AutoModel):
     _client = None
-    text_model = StringAttr(default="gpt-4o")
-    image_model = StringAttr(default="dall-e-3")
-    json_model = StringAttr(default="gpt-4o")
+    _text_model = "gpt-4o-mini"
+    _image_model = "dall-e-3"
+    _json_model = "gpt-4o"
     agent_id = StringAttr()
     messages = ListAttr(StringAttr(default=[]))
     tools = DictAttr()
@@ -59,23 +60,25 @@ class OpenAIModel(AutoModel):
                 instructions=self.instructions,
                 description=self.description,
                 name=self.name,
-                model=self.json_model,
+                model=self._json_model,
             )
             self.agent_id = agent.id
             log(f"==== Creating Agent with ID: {self.agent_id} ====")
             self.save()
         return self.agent_id
 
-    def clear_files(self, file_id=None):
+    def clear_files(self, file_id=None, all=False):
         if not file_id:
             store_files = self.client.files.list().data
-            for sf in store_files:
-                self.client.files.delete(file_id=sf.id)
+
             for vs in self.client.beta.vector_stores.list().data:
                 try:
                     self.client.beta.vector_stores.delete(vs.id)
                 except openai_NotFoundError:
                     log(f"==== Vector Store {vs.id} not found ====")
+            if all:
+                for sf in store_files:
+                    self.client.files.delete(file_id=sf.id)
         else:
             self.client.files.delete(file_id=file_id)
         self.tools.pop("file_search", None)
@@ -112,17 +115,18 @@ class OpenAIModel(AutoModel):
 
     def _add_function(self, user_function):
         user_function["strict"] = True
-        user_function["parameters"]["required"] = list(
-            user_function["parameters"]["properties"].keys()
-        )
         user_function["parameters"]["additionalProperties"] = False
+        if not user_function["parameters"].get("required"):
+            user_function["parameters"]["required"] = list(
+                user_function["parameters"]["properties"].keys()
+            )
 
         self.tools["function"] = {"type": "function", "function": user_function}
         self.client.beta.assistants.update(
             self._get_agent_id(), tools=list(self.tools.values())
         )
         return """
-IMPORTANT: Always use the function 'response' tool to respond to the user with the only the requested JSON schema. DO NOT add any text to the response outside of the JSON schema.
+IMPORTANT: Always use the function 'response' tool to respond to the user with only the requested JSON schema. DO NOT add any text to the response outside of the JSON schema.
 
         """
 
@@ -141,34 +145,64 @@ IMPORTANT: Always use the function 'response' tool to respond to the user with t
         return message_list
 
     def generate_json(self, messages, function, additional_instructions=""):
-        _instructions_addition = self._add_function(function)
-        _instructions_addition += additional_instructions
+        # _instructions_addition = self._add_function(function)
+        function["strict"] = True
+        function["parameters"]["additionalProperties"] = False
+        function["parameters"]["required"] = list(
+            function["parameters"]["properties"].keys()
+        )
 
         formatted_messages = self._format_messages(messages)
         thread = self.client.beta.threads.create(messages=formatted_messages)
-
-        run = self.client.beta.threads.runs.create(
-            thread_id=thread.id,
-            assistant_id=self._get_agent_id(),
-            additional_instructions=_instructions_addition,
-            parallel_tool_calls=False,
-        )
-
-        while run.status in ["queued", "in_progress"]:
-            run = self.client.beta.threads.runs.retrieve(
-                thread_id=thread.id,
-                run_id=run.id,
-            )
-            time.sleep(0.5)
-            log(f"==== Job Status: {run.status} ====")
-            print(f"==== Job Status: {run.status} ====")
-
+        # log(function, _print=True)
+        running_job = True
+        while running_job:
+            try:
+                run = self.client.beta.threads.runs.create_and_poll(
+                    thread_id=thread.id,
+                    assistant_id=self._get_agent_id(),
+                    additional_instructions=additional_instructions,
+                    parallel_tool_calls=False,
+                    tools=[
+                        {"type": "file_search"},
+                        {"type": "function", "function": function},
+                    ],
+                    tool_choice={
+                        "type": "function",
+                        "function": {"name": function["name"]},
+                    },
+                )
+                log(f"==== Job Status: {run.status} ====", _print=True)
+                if run.status in [
+                    "failed",
+                    "expired",
+                    "canceled",
+                    "completed",
+                    "incomplete",
+                    "requires_action",
+                ]:
+                    running_job = False
+
+            except openai.error.BadRequestError as e:
+                # Handle specific bad request errors
+                error_message = e.json_body.get("error", {}).get("message", "")
+                if "already has an active run" in error_message:
+                    log("Previous run is still active. Waiting...", _print=True)
+                    time.sleep(2)  # wait before retrying or checking run status
+                else:
+                    raise e
+
+        # while run.status in ["queued", "in_progress"]:
+        #     run = self.client.beta.threads.runs.retrieve(
+        #         thread_id=thread.id,
+        #         run_id=run.id,
+        #     )
+        #     time.sleep(0.5)
         if run.status in ["failed", "expired", "canceled"]:
-            log(f"==== Error: {run.last_error} ====")
-            print(f"==== Error: {run.last_error} ====")
+            log(f"==== !!! ERROR !!!: {run.last_error} ====", _print=True)
             return None
-        print("=================== RUN COMPLETED ===================")
-        print(run.status)
+        log("=================== RUN COMPLETED ===================", _print=True)
+        log(run.status, _print=True)
         if run.status == "completed":
             response = self.client.beta.threads.messages.list(thread_id=thread.id)
             results = response.data[0].content[0].text.value
@@ -177,21 +211,18 @@ IMPORTANT: Always use the function 'response' tool to respond to the user with t
                 0
             ].function.arguments
         else:
-            log(f"====Status: {run.status} Error: {run.last_error} ====")
-            print(f"====Status: {run.status} Error: {run.last_error} ====")
+            log(f"====Status: {run.status} Error: {run.last_error} ====", _print=True)
             return None
 
         results = results[results.find("{") : results.rfind("}") + 1]
         try:
             results = json.loads(results, strict=False)
         except Exception:
-            print(f"==== Invalid JSON:\n{results}")
-            log(f"==== Invalid JSON:\n{results}")
+            print(f"==== Invalid JSON:\n{results}", _print=True)
             return {}
         else:
-            log(f"==== Results: {results} ====")
-            print(results)
-            print("=================== END REPORT ===================")
+            log(f"==== Results: {results}", _print=True)
+            log("=================== END REPORT ===================", _print=True)
             return results
 
     def generate_text(self, messages, additional_instructions=""):
@@ -211,25 +242,22 @@ IMPORTANT: Always use the function 'response' tool to respond to the user with t
                 run_id=run.id,
             )
             time.sleep(0.5)
-            log(f"==== Job Status: {run.status} ====")
-            print(f"==== Job Status: {run.status} ====")
+            log(f"==== Job Status: {run.status} ====", _print=True)
 
         if run.status in ["failed", "expired", "canceled"]:
-            log(f"==== Error: {run.last_error} ====")
-            print(f"==== Error: {run.last_error} ====")
+            log(f"==== Error: {run.last_error} ====", _print=True)
             return None
-        print("=================== RUN COMPLETED ===================")
-        print(run.status)
+        log("=================== RUN COMPLETED ===================", _print=True)
+        log(run.status, _print=True)
         if run.status == "completed":
             response = self.client.beta.threads.messages.list(thread_id=thread.id)
             results = response.data[0].content[0].text.value
         else:
-            log(f"====Status: {run.status} Error: {run.last_error} ====")
-            print(f"====Status: {run.status} Error: {run.last_error} ====")
+            log(f"====Status: {run.status} Error: {run.last_error} ====", _print=True)
             return None
 
-        print(results)
-        print("=================== END REPORT ===================")
+        log(results, _print=True)
+        log("=================== END REPORT ===================", _print=True)
         return results
 
     def generate_audio(self, prompt, file_path, **kwargs):
@@ -248,7 +276,7 @@ IMPORTANT: Always use the function 'response' tool to respond to the user with t
         image = None
         try:
             response = self.client.images.generate(
-                model=self.image_model,
+                model=self._image_model,
                 prompt=prompt,
                 response_format="b64_json",
                 **kwargs,
@@ -269,7 +297,7 @@ IMPORTANT: Always use the function 'response' tool to respond to the user with t
             {"role": "user", "content": text},
         ]
         response = self.client.chat.completions.create(
-            model="gpt-4o-mini", messages=message
+            model=self._text_model, messages=message
         )
         try:
             result = response.choices[0].message.content

{autonomous_app-0.3.0 → autonomous_app-0.3.2}/src/autonomous/ai/oaiagent.py

@@ -1,13 +1,3 @@
-import io
-import json
-import os
-import random
-import time
-from base64 import b64decode
-
-from openai import OpenAI
-from pydantic import model_validator
-
 from autonomous import log
 from autonomous.model.autoattr import ReferenceAttr
 from autonomous.model.automodel import AutoModel
@@ -16,7 +6,7 @@ from .models.openai import OpenAIModel
 
 
 class OAIAgent(AutoModel):
-    client_model = ReferenceAttr()
+    client_model = ReferenceAttr(choices=[OpenAIModel])
     _ai_model = OpenAIModel
 
     @property
@@ -26,9 +16,6 @@ class OAIAgent(AutoModel):
             self.save()
         return self.client_model
 
-    def __init__(self, **kwargs):
-        self._client = OpenAI(api_key=os.environ.get("OPENAI_KEY"))
-
     def clear_files(self, file_id=None):
         return self.client.clear_files(file_id)
 

{autonomous_app-0.3.0 → autonomous_app-0.3.2}/src/autonomous/ai/textagent.py

@@ -6,7 +6,7 @@ from .models.openai import OpenAIModel
 
 
 class TextAgent(AutoModel):
-    client = ReferenceAttr()
+    client = ReferenceAttr(choices=[OpenAIModel])
     name = StringAttr(default="textagent")
     instructions = StringAttr(
         default="You are highly skilled AI trained to assist with generating text according to the given requirements."

{autonomous_app-0.3.0 → autonomous_app-0.3.2}/src/autonomous/auth/autoauth.py

@@ -1,3 +1,4 @@
+import json
 import uuid
 from datetime import datetime
 from functools import wraps
@@ -7,11 +8,11 @@ from authlib.integrations.requests_client import OAuth2Auth, OAuth2Session
 from flask import redirect, session, url_for
 
 from autonomous import log
-from autonomous.auth.user import AutoUser
+from autonomous.auth.user import User
 
 
 class AutoAuth:
-    user_class: type[AutoUser] = AutoUser
+    user_class: type[User] = User
 
     def __init__(
         self,
@@ -46,13 +47,12 @@ class AutoAuth:
         """
         Returns the current user.
         """
-        user = cls.user_class.get_guest()
-        if session.get("user") and session["user"]["state"] == "authenticated":
-            try:
-                user = cls.user_class.get(session["user"].get("pk"))
-                user.pk
-            except Exception as e:
-                log(e, session["user"])
+
+        user = (
+            cls.user_class.from_json(session["user"]) if session.get("user") else None
+        )
+        if not user or user.state != "authenticated":
+            user = cls.user_class.get_guest()
         return user
 
     def authenticate(self):
@@ -106,7 +106,7 @@ class AutoAuth:
                     user.last_login = datetime.now()
                     # log(user)
                     user.save()
-                session["user"] = user.serialize()
+                session["user"] = user.to_json()
                 # log(guest, user.is_guest)
                 if not guest and user.is_guest:
                     return redirect(url_for("auth.login"))

{autonomous_app-0.3.0 → autonomous_app-0.3.2}/src/autonomous/auth/user.py

@@ -14,6 +14,11 @@ class AutoUser(AutoModel):
     This class represents a user who can authenticate using OpenID.
     """
 
+    meta = {
+        "abstract": True,
+        "allow_inheritance": True,
+        "strict": False,
+    }
     name = StringAttr(default="Anonymous")
     email = StringAttr(required=True)
     last_login = DateTimeAttr(default=datetime.now)
@@ -34,9 +39,10 @@ class AutoUser(AutoModel):
         email = user_info["email"].strip()
         name = user_info["name"].strip()
         user = cls.find(email=email)
+        log(email, user)
         if not user:
             log(f"Creating new user for {email}")
-            user = cls(name=name, email=email)
+            # user = cls(name=name, email=email)
 
         # parse user_info into a user object
         user.name = name
@@ -51,7 +57,7 @@ class AutoUser(AutoModel):
         """
         Returns a guest user.
         """
-        guest = cls.find(name="_GuestOfAutonomous_", state="guest")
+        guest = cls.find(name="_GuestOfAutonomous_")
         if not guest:
             guest = cls(
                 name="_GuestOfAutonomous_",
@@ -82,3 +88,12 @@ class AutoUser(AutoModel):
         Returns True if the user is a guest, False otherwise.
         """
         return self.is_authenticated and self.role == "admin"
+
+
+class User(AutoUser):
+    """
+    This class represents a user who can authenticate using OpenID.
+    """
+
+    def __repr__(self):
+        return f"<User {self.pk} {self.email}>"

autonomous_app-0.3.2/src/autonomous/db/__init__.py

@@ -0,0 +1,42 @@
+# Import submodules so that we can expose their __all__
+# Import everything from each submodule so that it can be accessed via
+# autonomous.db, e.g. instead of `from autonomous.db.connection import connect`,
+# users can simply use `from autonomous.db import connect`, or even
+# `from autonomous.db import *` and then `connect('testdb')`.
+from autonomous.db import (
+    connection,
+    document,
+    errors,
+    fields,
+    queryset,
+    signals,
+)
+from autonomous.db.connection import *  # noqa: F401
+from autonomous.db.document import *  # noqa: F401
+from autonomous.db.errors import *  # noqa: F401
+from autonomous.db.fields import *  # noqa: F401
+from autonomous.db.queryset import *  # noqa: F401
+from autonomous.db.signals import *  # noqa: F401
+
+__all__ = (
+    list(document.__all__)
+    + list(fields.__all__)
+    + list(connection.__all__)
+    + list(queryset.__all__)
+    + list(signals.__all__)
+    + list(errors.__all__)
+)
+
+
+VERSION = (0, 29, 0)
+
+
+def get_version():
+    """Return the VERSION as a string.
+
+    For example, if `VERSION == (0, 10, 7)`, return '0.10.7'.
+    """
+    return ".".join(map(str, VERSION))
+
+
+__version__ = get_version()

autonomous_app-0.3.2/src/autonomous/db/base/__init__.py

@@ -0,0 +1,33 @@
+# Base module is split into several files for convenience. Files inside of
+# this module should import from a specific submodule (e.g.
+# `from autonomous.db.base.document import BaseDocument`), but all of the
+# other modules should import directly from the top-level module (e.g.
+# `from autonomous.db.base import BaseDocument`). This approach is cleaner and
+# also helps with cyclical import errors.
+from autonomous.db.base.common import *
+from autonomous.db.base.datastructures import *
+from autonomous.db.base.document import *
+from autonomous.db.base.fields import *
+from autonomous.db.base.metaclasses import *
+
+__all__ = (
+    # common
+    "UPDATE_OPERATORS",
+    "_document_registry",
+    "get_document",
+    # datastructures
+    "BaseDict",
+    "BaseList",
+    "EmbeddedDocumentList",
+    "LazyReference",
+    # document
+    "BaseDocument",
+    # fields
+    "BaseField",
+    "ComplexBaseField",
+    "ObjectIdField",
+    "GeoJsonBaseField",
+    # metaclasses
+    "DocumentMetaclass",
+    "TopLevelDocumentMetaclass",
+)

autonomous_app-0.3.2/src/autonomous/db/base/common.py

@@ -0,0 +1,62 @@
+from autonomous.db.errors import NotRegistered
+
+__all__ = ("UPDATE_OPERATORS", "get_document", "_document_registry")
+
+
+UPDATE_OPERATORS = {
+    "set",
+    "unset",
+    "inc",
+    "dec",
+    "mul",
+    "pop",
+    "push",
+    "push_all",
+    "pull",
+    "pull_all",
+    "add_to_set",
+    "set_on_insert",
+    "min",
+    "max",
+    "rename",
+}
+
+
+_document_registry = {}
+
+
+def get_document(name):
+    """Get a registered Document class by name."""
+    doc = _document_registry.get(name, None)
+    if not doc:
+        # Possible old style name
+        single_end = name.split(".")[-1]
+        compound_end = ".%s" % single_end
+        possible_match = [
+            k for k in _document_registry if k.endswith(compound_end) or k == single_end
+        ]
+        if len(possible_match) == 1:
+            doc = _document_registry.get(possible_match.pop(), None)
+    if not doc:
+        raise NotRegistered(
+            """
+            `%s` has not been registered in the document registry.
+            Importing the document class automatically registers it, has it
+            been imported?
+        """.strip()
+            % name
+        )
+    return doc
+
+
+def _get_documents_by_db(connection_alias, default_connection_alias):
+    """Get all registered Documents class attached to a given database"""
+
+    def get_doc_alias(doc_cls):
+        return doc_cls._meta.get("db_alias", default_connection_alias)
+
+    return [
+        doc_cls
+        for doc_cls in _document_registry.values()
+        if get_doc_alias(doc_cls) == connection_alias
+    ]