Update abstra-lib

Author: abstra-bot

.gitignore

@@ -129,4 +129,7 @@ venv.bak/
 .vscode/
 
 # version
-VERSION
+VERSION
+
+# docker
+.docker

abstra_internals/cloud/hooks.py abstra_internals/cloud/ghooks.py

@@ -5,6 +5,7 @@
 from gunicorn.arbiter import Arbiter
 from gunicorn.workers.base import Worker
 
+from abstra_internals.controllers.main import MainController
 from abstra_internals.environment import (
     DEFAULT_PORT,
     THREADS,
@@ -16,7 +17,6 @@
 )
 from abstra_internals.logger import AbstraLogger
 from abstra_internals.repositories.execution_logs import StdioLogEntry
-from abstra_internals.server.controller.main import MainController
 from abstra_internals.utils import get_internal_id
 
 

abstra_internals/cloud/server.py

@@ -1,9 +1,9 @@
 from abstra_internals.cloud.application import CustomApplication
-from abstra_internals.cloud.hooks import GunicornOptionsBuilder
+from abstra_internals.cloud.ghooks import GunicornOptionsBuilder
+from abstra_internals.controllers.main import MainController
 from abstra_internals.environment import DEFAULT_PORT
 from abstra_internals.logger import AbstraLogger
 from abstra_internals.server.apps import get_cloud_app
-from abstra_internals.server.controller.main import MainController
 from abstra_internals.settings import SettingsController
 from abstra_internals.stdio_patcher import StdioPatcher
 

abstra_internals/server/controller/ai.py abstra_internals/controllers/ai.py

@@ -2,21 +2,18 @@
 from dataclasses import dataclass
 from typing import Any, Dict, List
 
-import flask
-
 from abstra_internals.cloud_api import (
     cancel_all,
     create_thread,
     generate_project,
     get_ai_messages,
 )
+from abstra_internals.controllers.linters import fix_all_linters
+from abstra_internals.controllers.main import MainController
 from abstra_internals.credentials import resolve_headers
 from abstra_internals.repositories.project.json_migrations import get_latest_version
 from abstra_internals.repositories.project.project import Project, ProjectRepository
-from abstra_internals.server.controller.linters import fix_all_linters
-from abstra_internals.server.controller.main import MainController
 from abstra_internals.settings import Settings
-from abstra_internals.usage import editor_manual_usage, editor_usage
 
 
 @dataclass
@@ -87,77 +84,3 @@ def init_stages(self, python_files: List[PythonFile]):
             else:
                 raise Exception(f"Invalid stage {file.stage}")
             script.file_path.write_text(file.content, encoding="utf-8")
-
-
-def get_editor_bp(main_controller: MainController):
-    bp = flask.Blueprint("editor_ai", __name__)
-    controller = AiController(main_controller)
-
-    @bp.post("/message")
-    @editor_usage
-    def _get_next_message():
-        body = flask.request.json
-        if not body:
-            flask.abort(400)
-
-        streamer = controller.send_ai_message(
-            body["messages"], body["runtime"], body["threadId"]
-        )
-
-        if streamer is None:
-            flask.abort(403)
-
-        return flask.Response(streamer, mimetype="text/event-stream")
-
-    @bp.post("/thread")
-    @editor_usage
-    def _create_thread():
-        thread = controller.create_thread()
-        if not thread:
-            flask.abort(403)
-        return thread
-
-    @bp.post("/cancel-all")
-    @editor_usage
-    def _cancel_all():
-        body = flask.request.json
-        if not body:
-            flask.abort(400)
-        thread_id = body.get("threadId")
-        if not thread_id:
-            flask.abort(400)
-        controller.cancel_all(thread_id)
-        return {"success": True}
-
-    @bp.post("/generate")
-    @editor_usage
-    def _generate():
-        body = flask.request.json
-        if not body:
-            flask.abort(400)
-
-        prompt = body.get("prompt")
-        if not prompt:
-            flask.abort(400)
-
-        controller.generate_project(prompt)
-        return {"success": True}
-
-    @bp.post("/vote")
-    def _vote():
-        body = flask.request.json
-        if not body:
-            flask.abort(400)
-        vote = body.get("vote")
-        question = body.get("question")
-        answer = body.get("answer")
-        context = body.get("context")
-
-        editor_manual_usage(
-            event="ai_vote",
-            payload=dict(vote=vote, question=question, answer=answer, context=context),
-        )
-
-        return {"success": True}
-
-    return bp

abstra_internals/server/controller/auth.py abstra_internals/controllers/auth.py

@@ -1,20 +1,14 @@
 import typing
 from typing import Optional, Tuple
 
-import flask
 import requests
 
 from abstra_internals.email_templates import authn_template
-from abstra_internals.environment import (
-    OIDC_AUTHORITY,
-)
+from abstra_internals.environment import OIDC_AUTHORITY
 from abstra_internals.logger import AbstraLogger
 from abstra_internals.repositories.email import EmailRepository
 from abstra_internals.repositories.jwt_signer import JWTRepository
 from abstra_internals.repositories.keyvalue import KVRepository
-from abstra_internals.server.controller.main import MainController
-from abstra_internals.usage import send_player_usage
-from abstra_internals.utils.email import is_valid_email
 
 
 def authn_kv_key(email: str) -> str:
@@ -114,66 +108,3 @@ def oidc_verify(self, access_token: str) -> Tuple[Optional[str], Optional[str]]:
         except Exception as e:
             AbstraLogger.capture_exception(e)
             return None, None
-
-
-def get_player_bp(main_controller: MainController):
-    bp = flask.Blueprint("auth", __name__)
-    controller = AuthController(
-        kv_repository=main_controller.kv_repository,
-        jwt_repository=main_controller.jwt_repository,
-        email_repository=main_controller.email_repository,
-    )
-
-    @bp.post("/authenticate")
-    def _authenticate():
-        data = flask.request.get_json(force=True)
-        if not data:
-            return flask.abort(400)
-
-        email = data.get("email")
-        if not email or not is_valid_email(email):
-            return flask.abort(400)
-
-        ok = controller.authenticate(email)
-        if not ok:
-            return flask.abort(400)
-
-        send_player_usage(event="_authenticate", payload={"email": email})
-        return {"ok": True}
-
-    @bp.post("/verify")
-    def _verify():
-        data = flask.request.get_json(force=True)
-        if not data:
-            return flask.abort(400)
-
-        email = data.get("email")
-        code = data.get("token")
-        if not email or not code:
-            return flask.abort(400)
-
-        status, jwt = controller.verify(email, code)
-        if not jwt:
-            return flask.abort(status)
-
-        send_player_usage(event="_verify", payload={"email": email})
-        return {"jwt": jwt}
-
-    @bp.post("/oidc-verify")
-    def _oidc_verify():
-        data = flask.request.get_json(force=True)
-        if not data:
-            return flask.abort(400)
-
-        access_token = data.get("access_token")
-        if not access_token:
-            return flask.abort(400)
-
-        jwt, email = controller.oidc_verify(access_token)
-        if not jwt:
-            return flask.abort(404)
-
-        send_player_usage(event="_oidc_verify", payload={"email": email})
-        return {"jwt": jwt}
-
-    return bp

abstra_internals/server/controller/env_vars.py abstra_internals/controllers/env_vars.py

@@ -1,11 +1,6 @@
 from dataclasses import dataclass
 from typing import Any, Dict, List, Literal, Union
 
-import flask
-
-from abstra_internals.server.controller.main import MainController
-from abstra_internals.usage import editor_usage
-
 
 @dataclass
 class CreateEnvVarBody:
@@ -58,33 +53,3 @@ def from_dict(data: List[Dict[str, Any]]) -> "PatchClientEnvVarBody":
             elif change_type == "delete":
                 changes.append(DeleteEnvVarBody.from_dict(item))
         return PatchClientEnvVarBody(changes=changes)
-
-
-def get_editor_bp(main_controller: MainController):
-    bp = flask.Blueprint("editor_env_vars", __name__)
-
-    # 1s pooling in this route
-    @bp.get("/")
-    def _get_env_vars():
-        return [
-            env_var.to_dict() for env_var in main_controller.env_vars_repository.list()
-        ]
-
-    @bp.patch("/")
-    @editor_usage
-    def _change_env_vars():
-        if flask.request.json is None:
-            flask.abort(400)
-
-        body = PatchClientEnvVarBody.from_dict(flask.request.json)
-        for change in body.changes:
-            if change.change == "create" or change.change == "update":
-                main_controller.env_vars_repository.set(
-                    name=change.name, value=change.value
-                )
-            elif change.change == "delete":
-                main_controller.env_vars_repository.unset(name=change.name)
-
-        return {"status": "ok"}
-
-    return bp