Add cli option besides env based configuration

Author: white-gecko

Containerfile

@@ -26,4 +26,4 @@ COPY --from=builder ${VIRTUAL_ENV} ${VIRTUAL_ENV}
 COPY sparql_file.py ./sparql_file.py
 COPY README.md ./README.md
 
-CMD ["uvicorn", "sparql_file:app", "--host", "", "--port", "8080"]
+CMD ["uvicorn", "sparql_file_env:app", "--host", "", "--port", "8080"]

Taskfile.yaml

@@ -15,12 +15,12 @@ tasks:
   serve:dev:
     desc: Start a development server
     cmds:
-      - poetry run fastapi dev sparql_file.py
+      - poetry run fastapi dev sparql_file_env.py
 
   serve:uvicorn:
     desc: Run with uvicorn
     cmds:
-      - poetry run uvicorn sparql_file:app --host '' --port 8080
+      - poetry run uvicorn sparql_file_env:app --host '' --port 8080
 
   serve:container:
     desc: Run the container with podman

poetry.lock

@@ -1,6 +1,6 @@
 [project]
 name = "sparql-file"
-version = "0.1.0"
+version = "0.1.1"
 description = ""
 authors = [
     {name = "Natanael Arndt",email = "[email protected]"}
@@ -13,6 +13,9 @@ dependencies = [
     "uvicorn (>=0.34.0,<0.35.0)",
 ]
 
+[project.optional-dependencies]
+cli = [ "typer>=0.16.1,<0.17.0" ]
+
 
 [build-system]
 requires = ["poetry-core>=2.0.0,<3.0.0"]
@@ -21,3 +24,6 @@ build-backend = "poetry.core.masonry.api"
 [tool.poetry.group.dev.dependencies]
 fastapi = {extras = ["standard"], version = "^0.115.8"}
 ruff = "^0.9.6"
+
+[project.scripts]
+sparql-file = "sparql_file_cli:app"

pyproject.toml

@@ -1,21 +1,17 @@
 from rdflib import Graph
 from rdflib_endpoint import SparqlEndpoint
-from textwrap import dedent
 
-import os
+DEFAULT_EXAMPLE_QUERY = "select * { ?s ?p ?o } limit 10"
 
-GRAPH_FILE = os.getenv("GRAPH_FILE")
-EXAMPLE_QUERY = os.getenv("EXAMPLE_QUERY", dedent("""
-select * { ?s ?p ?o } limit 10
-""").strip())
 
-g = Graph()
+def sparql_file(graph_file: str, example_query: str = DEFAULT_EXAMPLE_QUERY):
+    g = Graph()
 
-with open(GRAPH_FILE, "r") as graph_file_io:
-    g.parse(source=graph_file_io)
+    with open(graph_file, "r") as graph_file_io:
+        g.parse(source=graph_file_io)
 
-# Start the SPARQL endpoint based on the RDFLib Graph
-app = SparqlEndpoint(
-    graph=g,
-    example_query=EXAMPLE_QUERY,
-)
+    # Return the SPARQL endpoint based on the RDFLib Graph
+    return SparqlEndpoint(
+        graph=g,
+        example_query=example_query,
+    )

sparql_file.py

@@ -0,0 +1,22 @@
+import typer
+import uvicorn
+
+from sparql_file import DEFAULT_EXAMPLE_QUERY, sparql_file
+
+app = typer.Typer()
+
+
+@app.command()
+def cli(
+    graph_file: str,
+    host: str = "0.0.0.0",
+    port: str = "8000",
+    example_query: str = DEFAULT_EXAMPLE_QUERY,
+):
+    """Start the sparql file server"""
+    endpoint = sparql_file(graph_file, example_query)
+    uvicorn.run(endpoint, host=host, port=port)
+
+
+if __name__ == "__main__":
+    app()

sparql_file_cli.py

@@ -0,0 +1,10 @@
+import os
+
+from sparql_file import sparql_file
+
+GRAPH_FILE = os.getenv("GRAPH_FILE")
+EXAMPLE_QUERY = os.getenv(
+    "EXAMPLE_QUERY",
+)
+
+app = sparql_file(GRAPH_FILE, EXAMPLE_QUERY)