Move each package into a separate module. Rename "ops" to "core". Fix test.

.gitignore

@@ -10,4 +10,5 @@
 __pycache__
 node_modules
 dist
+build
 *.egg-info

README.md

@@ -9,7 +9,7 @@ original LynxKite. The primary goals of this rewrite are:
 
 ## Structure
 
-- `lynxkite-ops`: Core types and utilities. Depend on this lightweight package if you are writing LynxKite plugins.
+- `lynxkite-core`: Core types and utilities. Depend on this lightweight package if you are writing LynxKite plugins.
 - `lynxkite-app`: The LynxKite web application. Install some plugins then run this to use LynxKite.
 - `lynxkite-graph-analytics`: Graph analytics plugin. The classical LynxKite experience!
 - `lynxkite-pillow`: A simple example plugin.

lynxkite-app/pyproject.toml

@@ -6,7 +6,7 @@ readme = "README.md"
 requires-python = ">=3.11"
 dependencies = [
     "fastapi[standard]>=0.115.6",
-    "lynxkite-ops",
+    "lynxkite-core",
     "orjson>=3.10.13",
     "pycrdt-websocket>=0.15.3",
     "pydantic-to-typescript>=2.0.0",
@@ -14,7 +14,7 @@ dependencies = [
 ]
 
 [tool.uv.sources]
-lynxkite-ops = { path = "../lynxkite-ops" }
+lynxkite-core = { path = "../lynxkite-core" }
 
 [build-system]
 requires = ["setuptools", "wheel", "setuptools-scm"]
@@ -25,8 +25,8 @@ namespaces = true
 where = ["src"]
 
 [tool.setuptools.package-data]
-"lynxkite.web_assets" = ["*"]
-"lynxkite.web_assets.assets" = ["*"]
+"lynxkite.app.web_assets" = ["*"]
+"lynxkite.app.web_assets.assets" = ["*"]
 
 [tool.setuptools]
 py-modules = ["build_frontend"]
@@ -36,4 +36,4 @@ include-package-data = true
 build_py = "build_frontend.build_py"
 
 [project.scripts]
-lynxkite = "lynxkite.__main__:main"
+lynxkite = "lynxkite.app.__main__:main"

lynxkite-app/src/build_frontend.py

@@ -11,7 +11,7 @@ class build_py(_build_py):
         print("\n\nBuilding frontend...", __file__)
         here = Path(__file__).parent.parent
         frontend_dir = here / "web"
-        package_dir = here / "src" / "lynxkite" / "web_assets"
+        package_dir = here / "src" / "lynxkite" / "app" / "web_assets"
         subprocess.check_call(["npm", "install"], cwd=frontend_dir)
         subprocess.check_call(["npm", "run", "build"], cwd=frontend_dir)
         print("files in", frontend_dir / "dist")

lynxkite-app/src/lynxkite/{__main__.py → app/__main__.py}

@@ -6,7 +6,7 @@ import os
 def main():
     port = int(os.environ.get("PORT", "8000"))
     reload = bool(os.environ.get("LYNXKITE_RELOAD", ""))
-    uvicorn.run("lynxkite.main:app", host="0.0.0.0", port=port, reload=reload)
+    uvicorn.run("lynxkite.app.main:app", host="0.0.0.0", port=port, reload=reload)
 
 
 if __name__ == "__main__":

lynxkite-app/src/lynxkite/{crdt.py → app/crdt.py}

@@ -11,6 +11,7 @@ import pycrdt_websocket
 import pycrdt_websocket.ystore
 import uvicorn
 import builtins
+from lynxkite.core import workspace
 
 router = fastapi.APIRouter()
 DATA_PATH = pathlib.Path.cwd() / "data"
@@ -119,8 +120,6 @@ def crdt_update(crdt_obj, python_obj, boxes=set()):
 
 
 def try_to_load_workspace(ws, name):
-    from . import workspace
-
     json_path = f"data/{name}"
     if os.path.exists(json_path):
         ws_pyd = workspace.load(json_path)
@@ -132,8 +131,6 @@ delayed_executions = {}
 
 
 async def workspace_changed(name, changes, ws_crdt):
-    from . import workspace
-
     ws_pyd = workspace.Workspace.model_validate(ws_crdt.to_py())
     # Do not trigger execution for superficial changes.
     # This is a quick solution until we build proper caching.
@@ -157,8 +154,6 @@ async def workspace_changed(name, changes, ws_crdt):
 
 
 async def execute(name, ws_crdt, ws_pyd, delay=0):
-    from . import workspace
-
     if delay:
         try:
             await asyncio.sleep(delay)

lynxkite-app/src/lynxkite/{main.py → app/main.py}

@@ -8,8 +8,8 @@ import pathlib
 import pkgutil
 from fastapi.staticfiles import StaticFiles
 import starlette
-from lynxkite import ops
-from lynxkite import workspace
+from lynxkite.core import ops
+from lynxkite.core import workspace
 from . import crdt
 
 here = pathlib.Path(__file__).parent
@@ -122,5 +122,5 @@ class SPAStaticFiles(StaticFiles):
                 raise ex
 
 
-static_dir = SPAStaticFiles(packages=[("lynxkite", "web_assets")], html=True)
+static_dir = SPAStaticFiles(packages=[("lynxkite.app", "web_assets")], html=True)
 app.mount("/", static_dir, name="web_assets")

lynxkite-app/uv.lock

@@ -209,7 +209,7 @@ wheels = [
 [[package]]
 name = "lynxkite"
 version = "0.1.0"
-source = { virtual = "." }
+source = { editable = "." }
 dependencies = [
     { name = "fastapi", extra = ["standard"] },
     { name = "lynxkite-ops" },

{lynxkite-ops → lynxkite-core}/pyproject.toml

@@ -1,5 +1,5 @@
 [project]
-name = "lynxkite-ops"
+name = "lynxkite-core"
 version = "0.1.0"
 description = "A lightweight dependency for authoring LynxKite operations and executors"
 readme = "README.md"

lynxkite-graph-analytics/pyproject.toml

@@ -5,11 +5,11 @@ description = "The graph analytics executor and boxes for LynxKite"
 readme = "README.md"
 requires-python = ">=3.11"
 dependencies = [
-    "lynxkite-ops",
+    "lynxkite-core",
     "networkx>=3.4.2",
     "pandas>=2.2.3",
     "polars[gpu]>=1.14.0",
 ]
 
 [tool.uv.sources]
-lynxkite-ops = { path = "../lynxkite-ops" }
+lynxkite-core = { path = "../lynxkite-core" }

lynxkite-graph-analytics/uv.lock

@@ -79,7 +79,7 @@ name = "lynxkite-graph-analytics"
 version = "0.1.0"
 source = { virtual = "." }
 dependencies = [
-    { name = "lynxkite-ops" },
+    { name = "lynxkite-core" },
     { name = "networkx" },
     { name = "pandas" },
     { name = "polars", extra = ["gpu"] },
@@ -87,16 +87,16 @@ dependencies = [
 
 [package.metadata]
 requires-dist = [
-    { name = "lynxkite-ops", virtual = "../lynxkite-ops" },
+    { name = "lynxkite-core", virtual = "../lynxkite-core" },
     { name = "networkx", specifier = ">=3.4.2" },
     { name = "pandas", specifier = ">=2.2.3" },
     { name = "polars", extras = ["gpu"], specifier = ">=1.14.0" },
 ]
 
 [[package]]
-name = "lynxkite-ops"
+name = "lynxkite-core"
 version = "0.1.0"
-source = { virtual = "../lynxkite-ops" }
+source = { virtual = "../lynxkite-core" }
 
 [[package]]
 name = "networkx"

lynxkite-lynxscribe/README.md

@@ -9,3 +9,9 @@ WEBUI_AUTH=false OPENAI_API_BASE_URL=http://localhost:8000/api/service/server.ly
 ```
 
 Or use [Lynx WebUI](https://github.com/biggraph/lynx-webui/) instead of Open WebUI.
+
+Run tests with:
+
+```bash
+uv run pytest
+```

lynxkite-lynxscribe/pyproject.toml

@@ -5,8 +5,8 @@ description = "LynxKite operations for LynxScribe chat applications"
 readme = "README.md"
 requires-python = ">=3.11"
 dependencies = [
-    "lynxkite-ops",
+    "lynxkite-core",
 ]
 
 [tool.uv.sources]
-lynxkite-ops = { path = "../lynxkite-ops" }
+lynxkite-core = { path = "../lynxkite-core" }

lynxkite-lynxscribe/src/lynxscribe/lynxkite/llm_ops.py

@@ -1,17 +1,19 @@
-"""For specifying an LLM agent logic flow."""
+"""For specifying an LLM agent logic flow.
 
-from . import ops
-import chromadb
+This is very much a prototype. It might end up merged into LynxScribe
+as an "agentic logic flow". It might just get deleted.
+
+(This is why the dependencies are left hanging.)
+"""
+
+from lynxkite.core import ops
 import enum
 import jinja2
 import json
-import openai
 import numpy as np
 import pandas as pd
-from .executors import one_by_one
+from lynxkite.core.executors import one_by_one
 
-chat_client = openai.OpenAI(base_url="http://localhost:8080/v1")
-embedding_client = openai.OpenAI(base_url="http://localhost:7997/")
 jinja = jinja2.Environment()
 chroma_client = None
 LLM_CACHE = {}
@@ -21,6 +23,9 @@ op = ops.op_registration(ENV)
 
 
 def chat(*args, **kwargs):
+    import openai
+
+    chat_client = openai.OpenAI(base_url="http://localhost:8080/v1")
     key = json.dumps({"method": "chat", "args": args, "kwargs": kwargs})
     if key not in LLM_CACHE:
         completion = chat_client.chat.completions.create(*args, **kwargs)
@@ -29,6 +34,9 @@ def chat(*args, **kwargs):
 
 
 def embedding(*args, **kwargs):
+    import openai
+
+    embedding_client = openai.OpenAI(base_url="http://localhost:7997/")
     key = json.dumps({"method": "embedding", "args": args, "kwargs": kwargs})
     if key not in LLM_CACHE:
         res = embedding_client.embeddings.create(*args, **kwargs)
@@ -97,9 +105,9 @@ def add_neighbors(nodes, edges, item):
 
 @op("Create prompt")
 def create_prompt(input, *, save_as="prompt", template: ops.LongStr):
-    assert (
-        template
-    ), "Please specify the template. Refer to columns using the Jinja2 syntax."
+    assert template, (
+        "Please specify the template. Refer to columns using the Jinja2 syntax."
+    )
     t = jinja.from_string(template)
     prompt = t.render(**input)
     return {**input, save_as: prompt}
@@ -186,6 +194,8 @@ def rag(
         else:
             collection_name = _ctx.node.id.replace(" ", "_")
             if chroma_client is None:
+                import chromadb
+
                 chroma_client = chromadb.Client()
             for c in chroma_client.list_collections():
                 if c.name == collection_name:

lynxkite-lynxscribe/src/lynxscribe/lynxkite/lynxscribe_ops.py

@@ -221,7 +221,7 @@ def view(input):
 
 async def get_chat_api(ws):
     import pathlib
-    from . import workspace
+    from lynxkite.core import workspace
 
     DATA_PATH = pathlib.Path.cwd() / "data"
     path = DATA_PATH / ws
@@ -304,7 +304,7 @@ async def api_service_get(request):
 
 def get_lynxscribe_workspaces():
     import pathlib
-    from . import workspace
+    from lynxkite.core import workspace
 
     DATA_DIR = pathlib.Path.cwd() / "data"
     workspaces = []

lynxkite-lynxscribe/src/lynxscribe/lynxkite/test_llm_ops.py

@@ -1,75 +0,0 @@
-import unittest
-from . import ops
-from . import llm_ops
-from .executors import one_by_one
-from . import workspace
-
-def make_node(id, op, type='basic', **params):
-  return workspace.WorkspaceNode(
-    id=id,
-    type=type,
-    position=workspace.Position(x=0, y=0),
-    data=workspace.WorkspaceNodeData(title=op, params=params),
-  )
-def make_input(id):
-  return make_node(
-    id, 'Input CSV',
-    filename='/Users/danieldarabos/Downloads/aimo-train.csv',
-    key='problem')
-def make_edge(source, target, targetHandle='input'):
-  return workspace.WorkspaceEdge(
-    id=f'{source}-{target}', source=source, target=target, sourceHandle='', targetHandle=targetHandle)
-
-class LLMOpsTest(unittest.TestCase):
-  def testExecute(self):
-    ws = workspace.Workspace(env='LLM logic', nodes=[
-      make_node(
-        '0', 'Input CSV',
-        filename='/Users/danieldarabos/Downloads/aimo-train.csv',
-        key='problem'),
-      make_node(
-        '1', 'View', type='table_view'),
-    ], edges=[
-      make_edge('0', '1')
-    ])
-    catalog = ops.CATALOGS[ws.env]
-    one_by_one.execute(ws, catalog)
-    # self.assertEqual('', ws.nodes[1].data.display)
-
-  def testStages(self):
-    ws = workspace.Workspace(env='LLM logic', nodes=[
-      make_input('in1'), make_input('in2'), make_input('in3'),
-      make_node('rag1', 'RAG'), make_node('rag2', 'RAG'),
-      make_node('p1', 'Create prompt'), make_node('p2', 'Create prompt'),
-    ], edges=[
-      make_edge('in1', 'rag1', 'db'), make_edge('in2', 'rag1'),
-      make_edge('rag1', 'p1'), make_edge('p1', 'rag2', 'db'),
-      make_edge('in3', 'p2'), make_edge('p3', 'rag2'),
-    ])
-    catalog = ops.CATALOGS[ws.env]
-    stages = one_by_one.get_stages(ws, catalog)
-    print(stages)
-    # self.assertEqual('', stages)
-
-  def testStagesMultiInput(self):
-    ws = workspace.Workspace(env='LLM logic', nodes=[
-      make_node('doc', 'Input document'),
-      make_node('split', 'Split document'),
-      make_node('graph', 'Build document graph'),
-      make_node('chat', 'Input chat'),
-      make_node('rag', 'RAG'),
-      make_node('neighbors', 'Add neighbors'),
-    ], edges=[
-      make_edge('doc', 'split'), make_edge('split', 'graph'),
-      make_edge('split', 'rag', 'db'), make_edge('chat', 'rag', 'input'),
-      make_edge('split', 'neighbors', 'nodes'),
-      make_edge('graph', 'neighbors', 'edges'),
-      make_edge('rag', 'neighbors', 'item'),
-    ])
-    catalog = ops.CATALOGS[ws.env]
-    stages = one_by_one.get_stages(ws, catalog)
-    print(stages)
-    # self.assertEqual('', stages)
-
-if __name__ == '__main__':
-  unittest.main()

lynxkite-pillow/pyproject.toml

@@ -5,9 +5,9 @@ description = "An example LynxKite plugin that wraps some Pillow image processin
 readme = "README.md"
 requires-python = ">=3.11"
 dependencies = [
-    "lynxkite-ops",
+    "lynxkite-core",
     "pillow>=11.1.0",
 ]
 
 [tool.uv.sources]
-lynxkite-ops = { path = "../lynxkite-ops" }
+lynxkite-core = { path = "../lynxkite-core" }

lynxkite-pillow/uv.lock

@@ -2,22 +2,22 @@ version = 1
 requires-python = ">=3.11"
 
 [[package]]
-name = "lynxkite-ops"
+name = "lynxkite-core"
 version = "0.1.0"
-source = { virtual = "../lynxkite-ops" }
+source = { virtual = "../lynxkite-core" }
 
 [[package]]
 name = "lynxkite-pillow"
 version = "0.1.0"
 source = { virtual = "." }
 dependencies = [
-    { name = "lynxkite-ops" },
+    { name = "lynxkite-core" },
     { name = "pillow" },
 ]
 
 [package.metadata]
 requires-dist = [
-    { name = "lynxkite-ops", virtual = "../lynxkite-ops" },
+    { name = "lynxkite-core", virtual = "../lynxkite-core" },
     { name = "pillow", specifier = ">=11.1.0" },
 ]