🧑‍💻 add CD (neo4j#51)

* 🧑‍💻 add CD

Author: noahmay

.github/workflows/release.yml

@@ -0,0 +1,41 @@
+name: "Release"
+
+permissions:
+  id-token: write
+  contents: read
+
+on:
+  push:
+    branches:
+      - "main"
+
+jobs:
+  build:
+    permissions:
+      contents: "read"
+      id-token: "write"
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - id: "auth"
+        name: "Authenticate to Google Cloud"
+        uses: "google-github-actions/auth@v1"
+        with:
+          create_credentials_file: true
+          workload_identity_provider: "projects/861986238120/locations/global/workloadIdentityPools/github-actions-pool/providers/github-actions"
+          service_account: "gha-app-engine-publisher@nallm-experiments.iam.gserviceaccount.com"
+      - id: "deploy-api"
+        name: Deploy API to App Engine
+        uses: "google-github-actions/deploy-appengine@v1"
+        with:
+          working_directory: "/home/runner/work/NaLLM/NaLLM/api"
+          deliverables: api.yaml
+      - id: "deploy-ui"
+        name: Deploy UI to App Engine
+        uses: "google-github-actions/deploy-appengine@v1"
+        with:
+          working_directory: "/home/runner/work/NaLLM/NaLLM/ui"
+          deliverables: app.yaml

api/api.yml api/api.yamlapi/api.yml renamed to api/api.yaml

@@ -2,7 +2,7 @@ runtime: python
 service: api
 env: flex
 
-entrypoint: cd src && gunicorn -w 4 -k uvicorn.workers.UvicornWorker main:app --timeout 60
+entrypoint: cd src && gunicorn -w 4 -k uvicorn.workers.UvicornWorker main:app --timeout 1000
 
 runtime_config:
   operating_system: "ubuntu22"

api/src/components/company_report.py

@@ -21,17 +21,17 @@ def run(self):
         summarize_results = SummarizeCypherResult(
             llm=self.llm,
         )
-
+        print("CompanyReport")
         company_data = self.database.query(
             "MATCH (n {name:$companyName}) return n.summary, n.isDissolved, n.nbrEmployees, n.name, n.motto, n.isPublic, n.revenue",
             {"companyName": self.company},
         )
-
+        print(company_data)
         relation_data = self.database.query(
             "MATCH (n {name:$companyName})-[r]->(m) WHERE NOT m:Article OPTIONAL MATCH (m)-[:IN_COUNTRY]->(c:Country) WITH r,m,c return r,m,c",
             {"companyName": self.company},
         )
-
+        print(relation_data)
         company_data_output = {
             "name": company_data[0]["n.name"],
             "motto": company_data[0]["n.motto"],
@@ -41,7 +41,8 @@ def run(self):
             "isPublic": company_data[0]["n.isPublic"],
             "revenue": company_data[0].get("n.revenue", None),
         }
-
+        print(company_data_output)
+        print("all data fetched")
         offices = []
         suppliers = []
         subsidiaries = []
@@ -122,7 +123,7 @@ def run(self):
             "Can you summarize the following articles about " + self.company + " ?",
             article_data[:HARD_LIMIT_CONTEXT_RECORDS],
         )
-
+        print("output: " + output)
         return {
             "company": company_data_output,
             "subsidiaries": subsidiaries,

api/src/main.py

@@ -232,6 +232,7 @@ async def root(payload: ImportPayload):
 
 class companyReportPayload(BaseModel):
     company: str
+    api_key: Optional[str]
 
 
 # This endpoint is database specific and only works with the Demo database.
@@ -250,7 +251,7 @@ async def companyInformation(payload: companyReportPayload):
         model_name="gpt-3.5-turbo-16k-0613",
         max_tokens=512,
     )
-
+    print("Running company report for " + payload.company)
     company_report = CompanyReport(neo4j_connection, payload.company, llm)
     result = company_report.run()
 

ui/app.yml ui/app.yamlui/app.yml renamed to ui/app.yaml

@@ -1,11 +1,17 @@
-runtime: nodejs18
+runtime: nodejs
 service: default
+env: flex
+
+runtime_config:
+  operating_system: "ubuntu22"
+  runtime_version: 18
 
 env_variables:
   VITE_UNSTRUCTURED_IMPORT_BACKEND_ENDPOINT: "https://api-dot-nallm-experiments.ew.r.appspot.com"
   VITE_KG_CHAT_BACKEND_ENDPOINT: "wss://api-dot-nallm-experiments.ew.r.appspot.com/text2text"
   VITE_HAS_API_KEY_ENDPOINT: "https://api-dot-nallm-experiments.ew.r.appspot.com/hasapikey"
   VITE_KG_CHAT_SAMPLE_QUESTIONS_ENDPOINT: "https://api-dot-nallm-experiments.ew.r.appspot.com/questionProposalsForCurrentDb"
+  VITE_REPORT_DATA_ENDPOINT: "https://api-dot-nallm-experiments.ew.r.appspot.com"
 
 handlers:
   - url: /.*

ui/package-lock.json

@@ -87,7 +87,9 @@ function App() {
 
   const changeSelectedCompany = async (company: string) => {
     setLoadingCompanyData(true);
-    const data = await getReportData(company);
+    const key = apiKey === "" ? undefined : apiKey;
+
+    const data = await getReportData(company, key);
     setLoadingCompanyData(false);
     console.log(data);
     if (data) {

ui/src/report-generation/App.tsx

@@ -8,7 +8,7 @@ type JSONResponse = {
 export const getReportData = async (company: string, apiKey?: string) => {
   const body = {
     company,
-    apiKey: apiKey ? apiKey : undefined,
+    api_key: apiKey ? apiKey : undefined,
   };
 
   const response = await fetch(