diff --git a/README.md b/README.md index 229bac8422d60fc13140179f758f5d3e428d1226..8862d06b038e954f484d4d92eb84df9156b8d450 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,9 @@ ## Development + +Deployment Diagram: https://app.diagrams.net/#G10-LtvKbhC-yzjVoTIg1bnr1wBKsA4s-V + ### localhost (laptop) * http://localhost:8000/adex-fastapi/skyviews/ * http://localhost:8000/adex-fastapi/skyviews_rectangle/?ra_min=40&ra_max=50&dec_min=25&dec_max=35&limit=1000 @@ -10,6 +13,10 @@ * https://sdc-dev.astron.nl/adex-fastapi/skyviews/ * https://sdc-dev.astron.nl/adex-fastapi/skyviews_rectangle/?ra_min=40&ra_max=50&dec_min=25&dec_max=35&limit=1000 +### SURF Research Cloud (dev environment) + * http://145.38.187.31/adex-fastapi/skyviews/ + * http://145.38.187.31/adex-fastapi/skyviews_rectangle/?ra_min=40&ra_max=50&dec_min=25&dec_max=35&limit=1000 + ## data procedures (rough) * [dump/load a copy of the alta database](https://web-of-wyrd.nl/myworkwiki/doku.php?id=alta_runtime&s[]=dump#qhow_do_i_dump_and_load_a_copy_of_the_production_database_with_postgres_into_a_dev_or_vm_environment) * [dump/load esap_cache sql](https://web-of-wyrd.nl/myworkwiki/doku.php?id=ucac4_converter&s[]=ucac4#performance) diff --git a/database/database.py b/database/database.py index 06d1f6a18ea8e0190eecf5119142e01938050688..05678a8deec4ec9f2d1d198a011807f9b1599dfb 100644 --- a/database/database.py +++ b/database/database.py @@ -4,10 +4,6 @@ from sqlalchemy import create_engine from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.orm import sessionmaker -# Note that we are using databases package as it uses asyncpg -# as an interface to talk to PostgreSQL database -import databases - # dev machine on SURFSara # DATABASE_URL = "postgresql://postgres:secret@145.38.187.31/adex_cache" @@ -15,17 +11,10 @@ import databases DATABASE_URL = os.environ.get('DATABASE_URL', 'postgresql://postgres:postgres@localhost/adex_cache') print('DATABASE_URL = '+DATABASE_URL) -# https://docs.sqlalchemy.org/en/14/orm/extensions/asyncio.html -my_database = databases.Database(DATABASE_URL) # asyncpg -metadata = sqlalchemy.MetaData() # asyncpg - engine = create_engine( DATABASE_URL, pool_size=3, max_overflow=0 ) -metadata.create_all(engine) # asyncpg - SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine) - Base = declarative_base() diff --git a/main.py b/main.py index 61cd0e4d29a6aaf9f449872c3fce8f648d9a86cb..107325487cc614cc17e3fc6544ba3e7ea5cef596 100644 --- a/main.py +++ b/main.py @@ -1,7 +1,6 @@ import uvicorn from fastapi import FastAPI from fastapi.middleware.cors import CORSMiddleware -from database.database import my_database from routers import skyviews @@ -30,13 +29,5 @@ app.add_middleware( allow_headers=["*"], ) -@app.on_event("startup") -async def startup(): - await my_database.connect() - -@app.on_event("shutdown") -async def shutdown(): - await my_database.disconnect() - if __name__ == "__main__": uvicorn.run(app, host="0.0.0.0", port=8000) \ No newline at end of file