An alternate approach to controlling how oak is initialized on startu…

…p to see how it behaves on gcp

backend/src/monarch_py/api/association.py

@@ -23,7 +23,7 @@ async def _get_associations(
     pagination: PaginationParams = Depends(),
 ) -> AssociationResults:
     """Retrieves all associations for a given entity, or between two entities."""
-    response = solr.get_associations(
+    response = solr().get_associations(
         category=category,
         predicate=predicate,
         subject=subject,

backend/src/monarch_py/api/config.py

@@ -15,6 +15,12 @@ class Settings(BaseSettings):
 
 settings = Settings()
 
-solr = SolrImplementation(base_url=settings.solr_url)
 
-oak = OakImplementation().init_semsim()
+@lru_cache(maxsize=1)
+def solr():
+    return SolrImplementation(settings.solr_url)
+
+
+@lru_cache(maxsize=1)
+def oak():
+    return OakImplementation().init_semsim()

backend/src/monarch_py/api/entity.py

@@ -26,7 +26,7 @@ async def _get_entity(
     Returns:
         Node: Entity details for the specified id
     """
-    response = solr.get_entity(id, extra=True)
+    response = solr().get_entity(id, extra=True)
     if response is None:
         raise HTTPException(status_code=404, detail="Entity not found")
     return Node(**response.__dict__)  # This is an odd consequence of how Node extends Entity
@@ -59,7 +59,7 @@ def _association_table(
     Returns:
         AssociationResults: Association table data for the specified entity and association type
     """
-    response = solr.get_association_table(
+    response = solr().get_association_table(
         entity=id, category=category, q=query, offset=pagination.offset, limit=pagination.limit
     )
     return response

backend/src/monarch_py/api/histopheno.py

@@ -12,7 +12,7 @@
 @router.get("/{id}")
 async def _get_histopheno(id) -> HistoPheno:
     """Retrieves the entity with the specified id"""
-    response = solr.get_histopheno(id)
+    response = solr().get_histopheno(id)
     if response is None:
         raise HTTPException(status_code=404, detail="Entity not found")
 

backend/src/monarch_py/api/main.py

@@ -3,13 +3,20 @@
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import RedirectResponse
 from monarch_py.api import association, entity, histopheno, search, semsim
+from monarch_py.api.config import oak
 
 PREFIX = "/v3/api"
+
 app = FastAPI(
     docs_url="/v3/docs",
     redoc_url="/v3/redoc",
-    on_startup=[],
 )
+
+
+@app.on_event('startup')
+async def initialize_app():
+    oak()
+
 app.include_router(entity.router, prefix=f"{PREFIX}/entity")
 app.include_router(association.router, prefix=f"{PREFIX}/association")
 app.include_router(search.router, prefix=PREFIX)

backend/src/monarch_py/api/search.py

@@ -31,7 +31,7 @@ async def search(
         EntityResults
     """
     facet_fields = ["category", "in_taxon_label"]
-    response = solr.search(
+    response = solr().search(
         q=q,
         category=category,
         in_taxon_label=taxon,
@@ -53,5 +53,5 @@ async def autocomplete(q: str) -> SearchResults:
     Returns:
         SearchResults
     """
-    response = solr.autocomplete(q=q)
+    response = solr().autocomplete(q=q)
     return response

backend/src/monarch_py/api/semsim.py

@@ -25,7 +25,7 @@ def _compare(
         subjects: {subjects.split(',')}
         objects: {objects.split(',')}
     """)
-    results = oak.compare(
+    results = oak().compare(
         subjects=subjects.split(","),
         objects=objects.split(","),
     )
@@ -48,4 +48,4 @@ def _post_compare(
 }
 </pre>
     """
-    return oak.compare(subjects, objects)
+    return oak().compare(subjects, objects)