poetry config

- setup poetry to use a local venv
- add that venv to node-calls-python
- simple dependency import test for sig-gen

.gitignore

@@ -6,6 +6,7 @@ tmp
 # Poetry specific files and directories
 .poetry/
 __pypackages__/
+.venv
 
 # node.js stuff
 node_modules

platform/src/bridge.ts

@@ -11,6 +11,13 @@ const py = nodecallspython.interpreter;
 // (and maybe preload some core stuff)
 export const run = async (scriptName: string, fnName: string, args: JSON) => {
   try {
+    // poetry should be configured to use a vnv in the local filesystem
+    // This makes it really easy to tell node-calls-python about the right env!
+    // TODO: Ah,not THAT easy, we need to work out the python version
+    py.addImportPath(path.resolve(".venv/lib/python3.11/site-packages"));
+
+    // TODO in dev mode I want to re-import the module every time
+    // But in prod I wanna use the cached import
     const pymodule = await py.import(
       path.resolve(`./services/${scriptName}/${scriptName}.py`),
       true

platform/src/middleware/services.ts

@@ -6,10 +6,11 @@ import { run } from "../bridge";
 import describeModules from "../util/describe-modules";
 
 export default async (app: Elysia) => {
+  console.log("Loading routes:");
   const modules = await describeModules(path.resolve("./services"));
-
   app.group("/services", (app) => {
     modules.forEach(({ name }) => {
+      console.log(" - mounted /services/" + name);
       app.post(name, async (ctx) => {
         // Note that elysia handles json parsing for me - neat!
         const payload = ctx.body;

poetry.toml

@@ -0,0 +1,2 @@
+# set up a .venv in this project
+virtualenvs.in-project = true

pyproject.toml

@@ -1,14 +1,16 @@
 [tool.poetry]
-name = "code-generator"
+name = "apollo"
 version = "0.1.0"
 description = "A python monorepo for AI code generation"
 authors = ["Isma-Ilou Sadou <[email protected]>"]
 license = "LGPLv3"
 readme = "README.md"
+package-mode = false
 
 [tool.poetry.dependencies]
 python = "^3.9"
 requests = "^2.31.0"
+fastapi = "^0.110.2"
 
 
 [build-system]
@@ -20,34 +22,34 @@ line-length = 120
 
 [tool.ruff]
 select = [
-    "E",    # pycodestyle
-    "F",    # pyflakes
-    "W",    # pycodestyle (warnings)
-    "I",    # isort
-    "N",    # pep8-naming
-    "UP",   # pyupgrade
-    "ANN",  # flake8-annotations
-    "B",    # flake8-bugbear
-    "A",    # flake8-builtins
-    "COM",  # flake8-commas
-    "C4",   # flake8-comprehensions
-    "DTZ",  # flake8-datetimez
-    "EXE",  # flake8-executable
-    "PIE",  # flake8-pie
-    "T20",  # flake8-print
-    "PT",   # flake8-pytest
-    "SIM",  # flake8-simplify
-    "ARG",  # flake8-unused-arguments
-    "PTH",  # flake8--use-pathlib
-    "ERA",  # flake8-eradicate
-    "RUF",  # ruff specific rules
-    "PL",   # pylint
+    "E",   # pycodestyle
+    "F",   # pyflakes
+    "W",   # pycodestyle (warnings)
+    "I",   # isort
+    "N",   # pep8-naming
+    "UP",  # pyupgrade
+    "ANN", # flake8-annotations
+    "B",   # flake8-bugbear
+    "A",   # flake8-builtins
+    "COM", # flake8-commas
+    "C4",  # flake8-comprehensions
+    "DTZ", # flake8-datetimez
+    "EXE", # flake8-executable
+    "PIE", # flake8-pie
+    "T20", # flake8-print
+    "PT",  # flake8-pytest
+    "SIM", # flake8-simplify
+    "ARG", # flake8-unused-arguments
+    "PTH", # flake8--use-pathlib
+    "ERA", # flake8-eradicate
+    "RUF", # ruff specific rules
+    "PL",  # pylint
 ]
 ignore = [
     "ANN101", # Missing type annotation for self in method
     "ANN204", # Missing type annotation for special method
     "ANN003", # Missing type annotation for `**kwargs`
-    "UP007", # Use `X | Y` for type annotations instead of Union
+    "UP007",  # Use `X | Y` for type annotations instead of Union
     "E501",
 ]
 line-length = 120

services/echo/echo.py

@@ -1,5 +1,7 @@
+from log import log
+
 # Simple python service to echo requests back to the caller
 # Used in test
 def main(x):
-  print('Echoing request')
+  log()
   return  x

services/echo/log.py

@@ -0,0 +1,2 @@
+def log():
+  print('Echoing request')

services/signature_generator/constants.py

@@ -0,0 +1,9 @@
+# API Constants
+HOST = "0.0.0.0"
+PORT = 8001
+
+# Inference Endpoints
+# CODET5_ENDPOINT = "http://localhost:8002/codet5/generate_code/"
+
+# codes
+SUCCESS_CODE: int = 200

services/signature_generator/models.py

@@ -0,0 +1,39 @@
+import logging
+from typing import Union
+from fastapi import HTTPException
+
+import requests
+from pydantic import BaseModel
+
+logging.basicConfig(level=logging.INFO)
+
+# TODO - remove all the HTTP stuff from this
+class SignatureGenerator:
+    def __init__(self, endpoint_url: str):
+        self.endpoint_url = endpoint_url
+        self.logger = logging.getLogger(__name__)
+
+    def generate(self, prompt: str) -> str:
+        try:
+            headers = {"Content-Type": "application/json"}
+            data = {"prompt": prompt}
+
+            response = requests.post(self.endpoint_url, headers=headers, json=data)
+            response.raise_for_status()
+            return response.json().get("generated_code")
+        except requests.exceptions.HTTPError as e:
+            error_message = f"HTTP error occurred: {e.response.status_code}, {e.response.text}, {self.endpoint_url}"
+            self.logger.error(error_message)
+            raise HTTPException(
+                status_code=e.response.status_code, detail=error_message
+            ) from e
+        except Exception as e:
+            error_message = f"An unexpected error occurred in code gen: {e}"
+            self.logger.error(error_message)
+            raise HTTPException(status_code=500, detail=error_message)
+
+
+class SignatureInput(BaseModel):
+    open_api_spec: Union[str, dict]
+    instruction: str
+    model: str = "codet5"