228 redeploy api

.github/workflows/cd.yml

@@ -0,0 +1,29 @@
+name: Continuous deployment
+
+on: 
+  pull_request:
+    types:
+      - closed
+    branches:
+      - 228-redeploy-api
+
+jobs:
+
+  docker-deploy-api:
+    name: build and deploy api docker container
+    if: github.event.pull_request.merged == true
+    runs-on: ubuntu-latest
+    steps:
+      - name: execute build and deploy commands on azure vm via ssh
+        uses: appleboy/[email protected]
+        with: 
+          host: ${{ secrets.HOST }}
+          key: ${{ secrets.DEPLOY_PK }}
+          username: ${{ secrets.USER }}
+          script: |
+            cd toponym-resolution
+            export CONTAINER_NAME=t-res_deezy_reldisamb-wpubl-wmtops
+            sudo -E docker-compose down --remove-orphans
+            sudo -E docker rmi $(sudo docker images --filter=reference='*:latest' --format {{.ID}})
+            sudo -E docker build -f app/template.Dockerfile --no-cache --build-arg APP_NAME=${CONTAINER_NAME} -t ${CONTAINER_NAME}_image .
+            HOST_URL=${{ secrets.HOST }} sudo -E docker-compose up -d

app/app_template.py

@@ -2,7 +2,7 @@
 import sys
 import time
 from pathlib import Path
-from typing import Union
+from typing import Union, Optional, List
 
 import uvicorn
 from fastapi import FastAPI, Request
@@ -25,9 +25,20 @@
 
 
 class APIQuery(BaseModel):
-    sentence: str
-    place: Union[str, None] = None
-    place_wqid: Union[str, None] = None
+    text: str
+    place: Optional[Union[str, None]] = None
+    place_wqid: Optional[Union[str, None]] = None
+
+
+class CandidatesAPIQuery(BaseModel):
+    toponyms: List[dict]
+
+
+class DisambiguationAPIQuery(BaseModel):
+    dataset: List[dict]
+    wk_cands: dict
+    place: Optional[Union[str, None]] = None
+    place_wqid: Optional[Union[str, None]] = None
 
 
 app_config_name = os.environ["APP_CONFIG_NAME"]
@@ -36,15 +47,7 @@ class APIQuery(BaseModel):
 
 @app.get("/")
 async def read_root(request: Request):
-    return {
-        "Title": request.app.title,
-        "request.url": request.url,
-        "request.query_params": request.query_params,
-        "root_path": request.scope.get("root_path"),
-        "request.client": request.client,
-        "hostname": os.uname()[1],
-        "worker_id": os.getpid(),
-    }
+    return {"Welcome to T-Res!": request.app.title}
 
 
 @app.get("/test")
@@ -58,17 +61,56 @@ async def test_pipeline():
     return resolved
 
 
-@app.get("/toponym_resolution")
-async def run_pipeline(api_query: APIQuery, request_id: Union[str, None] = None):
+@app.get("/resolve_sentence")
+async def run_sentence(api_query: APIQuery, request_id: Union[str, None] = None):
     place = "" if api_query.place is None else api_query.place
     place_wqid = "" if api_query.place_wqid is None else api_query.place_wqid
     resolved = geoparser.run_sentence(
-        api_query.sentence, place=api_query.place, place_wqid=api_query.place_wqid
+        api_query.text, place=place, place_wqid=place_wqid
     )
 
     return resolved
 
 
+@app.get("/resolve_full_text")
+async def run_text(api_query: APIQuery):
+
+    place = "" if api_query.place is None else api_query.place
+    place_wqid = "" if api_query.place_wqid is None else api_query.place_wqid
+    resolved = geoparser.run_text(api_query.text, place=place, place_wqid=place_wqid)
+
+    return resolved
+
+
+@app.get("/run_ner")
+async def run_ner(api_query: APIQuery):
+
+    place = "" if api_query.place is None else api_query.place
+    place_wqid = "" if api_query.place_wqid is None else api_query.place_wqid
+    ner_output = geoparser.run_text_recognition(
+        api_query.text, place=place, place_wqid=place_wqid
+    )
+
+    return ner_output
+
+
+@app.get("/run_candidate_selection")
+async def run_candidate_selection(cand_api_query: CandidatesAPIQuery):
+
+    wk_cands = geoparser.run_candidate_selection(cand_api_query.toponyms)
+    return wk_cands
+
+
+@app.get("/run_disambiguation")
+async def run_disambiguation(api_query: DisambiguationAPIQuery):
+    place = "" if api_query.place is None else api_query.place
+    place_wqid = "" if api_query.place_wqid is None else api_query.place_wqid
+    disamb_output = geoparser.run_disambiguation(
+        api_query.dataset, api_query.wk_cands, place, place_wqid
+    )
+    return disamb_output
+
+
 @app.get("/health")
 async def healthcheck():
     return {"status": "ok"}