Caching config in GateKeeperIntegration API + removing startup.sh files.

solliancenet · Jan 15, 2024 · a067667 · a067667
1 parent 5a892c7
commit a067667
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 16 deletions.
diff --git a/src/python/AgentHubAPI/AgentHubAPI.pyproj b/src/python/AgentHubAPI/AgentHubAPI.pyproj
@@ -40,7 +40,6 @@
     <Content Include=".gitignore" />
     <Content Include=".pylintrc" />
     <Content Include="requirements.txt" />
-    <Content Include="startup.sh" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PythonSDK\PythonSDK.pyproj">

diff --git a/src/python/AgentHubAPI/startup.sh b/src/python/AgentHubAPI/startup.sh
diff --git a/src/python/DataSourceHubAPI/DataSourceHubAPI.pyproj b/src/python/DataSourceHubAPI/DataSourceHubAPI.pyproj
@@ -42,7 +42,6 @@
     <Content Include=".gitignore" />
     <Content Include=".pylintrc" />
     <Content Include="requirements.txt" />
-    <Content Include="startup.sh" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PythonSDK\PythonSDK.pyproj">

diff --git a/src/python/DataSourceHubAPI/startup.sh b/src/python/DataSourceHubAPI/startup.sh
diff --git a/src/python/GatekeeperIntegrationAPI/GatekeeperIntegrationAPI.pyproj b/src/python/GatekeeperIntegrationAPI/GatekeeperIntegrationAPI.pyproj
@@ -5,7 +5,7 @@
     <ProjectGuid>f74cbb5a-97b9-4f68-8077-8bab49c841dc</ProjectGuid>
     <ProjectHome>
     </ProjectHome>
-    <StartupFile>app/main.py</StartupFile>
+    <StartupFile>run.py</StartupFile>
     <SearchPath>..\IntegrationSDK</SearchPath>
     <WorkingDirectory>.</WorkingDirectory>
     <OutputPath>.</OutputPath>
@@ -31,6 +31,7 @@
     <Compile Include="app\routers\status.py" />
     <Compile Include="app\routers\__init__.py" />
     <Compile Include="app\__init__.py" />
+    <Compile Include="run.py" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="app\" />
@@ -40,7 +41,6 @@
     <Content Include=".gitignore" />
     <Content Include=".pylintrc" />
     <Content Include="requirements.txt" />
-    <Content Include="startup.sh" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\IntegrationSDK\IntegrationSDK.pyproj">

diff --git a/src/python/GatekeeperIntegrationAPI/app/main.py b/src/python/GatekeeperIntegrationAPI/app/main.py
@@ -2,7 +2,6 @@
 Main entry-point for the FoundationaLLM DataSourceHubAPI.
 Runs web server exposing the API.
 """
-import uvicorn
 from fastapi import FastAPI
 from app.dependencies import get_config
 from app.routers import analyze, status
@@ -42,7 +41,3 @@ async def root():
         Returns a JSON object containing a message and value.
     """
     return { 'message': 'FoundationaLLM GatekeeperIntegrationAPI' }
-
-if __name__ == '__main__':
-    uvicorn.run('main:app', host='0.0.0.0', port=8042, reload=True,
-                forwarded_allow_ips='*', proxy_headers=True)
diff --git a/src/python/GatekeeperIntegrationAPI/run.py b/src/python/GatekeeperIntegrationAPI/run.py
@@ -0,0 +1,11 @@
+import uvicorn
+
+if __name__ == '__main__':
+    uvicorn.run(
+        'app.main:app',
+        host='0.0.0.0',
+        port=8042,
+        reload=True,
+        forwarded_allow_ips='*',
+        proxy_headers=True
+    )
diff --git a/src/python/GatekeeperIntegrationAPI/startup.sh b/src/python/GatekeeperIntegrationAPI/startup.sh
diff --git a/src/python/LangChainAPI/LangChainAPI.pyproj b/src/python/LangChainAPI/LangChainAPI.pyproj
@@ -37,7 +37,6 @@
     <Content Include=".gitignore" />
     <Content Include=".pylintrc" />
     <Content Include="requirements.txt" />
-    <Content Include="startup.sh" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="app\dependencies.py" />

diff --git a/src/python/LangChainAPI/startup.sh b/src/python/LangChainAPI/startup.sh
diff --git a/src/python/PromptHubAPI/PromptHubAPI.pyproj b/src/python/PromptHubAPI/PromptHubAPI.pyproj
@@ -39,7 +39,6 @@
     <Content Include=".gitignore" />
     <Content Include=".pylintrc" />
     <Content Include="requirements.txt" />
-    <Content Include="startup.sh" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PythonSDK\PythonSDK.pyproj">

diff --git a/src/python/PromptHubAPI/startup.sh b/src/python/PromptHubAPI/startup.sh