trying

App/Analytics/Model.py

@@ -1,5 +1,5 @@
 import asyncio
-import orm
+from App.modelInit import orm
 import psycopg2
 import datetime
 import pydantic

App/Transcription/Model.py

@@ -1,4 +1,4 @@
-import orm
+from App.modelInit import orm
 import datetime
 from App.modelInit import database, models
 from App.Users.Model import User

App/UserTranscriptions/UserTranscriptionsRoutes.py

@@ -1,6 +1,7 @@
 from fastapi import APIRouter
 from .Schemas import BaseRequest, GetTranscriptions
 from .Model import UserTranscriptions
+from App.modelInit import models
 from App.Users.Model import User
 
 user_transcriptions_router = APIRouter(tags=["user-transcriptions"])

App/Users/Model.py

@@ -1,5 +1,5 @@
 import asyncio
-import orm
+from App.modelInit import orm
 import psycopg2
 import datetime
 import pydantic

App/__init__.py

@@ -1,5 +1,7 @@
 import uuid, contextvars
 from telethon import TelegramClient
+
+
 import os
 
 print(os.getcwd())

App/__main__.py

@@ -0,0 +1,28 @@
+# from App.app import app
+from App.modelInit import models, dbLink
+import asyncio
+from sqlalchemy.ext.asyncio import create_async_engine
+
+
+async def async_main() -> None:
+    engine = create_async_engine(
+        dbLink,
+        echo=True,
+    )
+
+    async with engine.begin() as conn:
+        await conn.run_sync(models.metadata.create_all)
+
+
+import uvicorn
+
+
+async def create_tables():
+    await async_main()
+
+
+if __name__ == "__main__":
+    loop = asyncio.get_event_loop()
+    loop.run_until_complete(create_tables())
+    loop.close()
+    uvicorn.run(app, host="0.0.0.0", port=7860)

App/app.py

@@ -8,7 +8,7 @@ from .Streaming.StreamingRoutes import streaming_router
 from .UserTranscriptions.UserTranscriptionsRoutes import user_transcriptions_router
 from .Monitor.monitorRoutes import monitor_router
 from fastapi.middleware.cors import CORSMiddleware
-import logging
+import logging, orm
 
 
 # Configure logging
@@ -18,8 +18,17 @@ logging.basicConfig(
     datefmt="%Y-%m-%d %H:%M:%S",
 )
 
-app = FastAPI()
 
+async def create_async_model(model):
+    import asyncio
+
+    # until something better comes along
+    url = model._get_database_url()
+    await asyncio.gather(asyncio.create_task(model._create_all(url)))
+
+
+app = FastAPI()
+models = orm.ModelRegistry(database=database)
 origins = ["*"]
 
 app.add_middleware(
@@ -33,9 +42,10 @@ app.add_middleware(
 
 @app.on_event("startup")
 async def startup_event():
-    await bot.start(bot_token="6183919505:AAEhHFt4mI18bQeAf2Lj7AePXFRPVLrOFM8")
+    # await bot.start(bot_token="6183919505:AAEhHFt4mI18bQeAf2Lj7AePXFRPVLrOFM8")
     # await upload_bot.start()
-    # await models.create_all()
+    # models.create_all()
+    # await create_async_model(models)
     if not database.is_connected:
         await database.connect()
         print("connected!")
@@ -43,8 +53,8 @@ async def startup_event():
 
 @app.on_event("shutdown")
 async def shutdown_event():
-    await bot.session.save()
-    await bot.disconnect()
+    # await bot.session.save()
+    # await bot.disconnect()
 
     # await upload_bot.stop()
     if not database.is_connected:

App/modelInit.py

@@ -1,22 +1,26 @@
 import databases
-import orm
-import psycopg2
+import orm, asyncio
 
 
-
-
-#deployment
-database = databases.Database(
-    "postgresql+asyncpg://postgres:[email protected]:5432/postgres"
-)
-
-
-#development
-
+# deployment
 # database = databases.Database(
-#     "postgresql+asyncpg://postgres:zJAkapOh3IVt8R0h@db.mygpwobpwxttmilnxrtu.supabase.co:5432/postgres"
+#     "postgresql+asyncpg://postgres:PkkneZrSFsnJR6B@db.vfhoydxvxuesxhrcdnmx.supabase.co:5432/postgres"
 # )
 
 
+# development
+dbLink = "postgresql+asyncpg://postgres:[email protected]:5432/postgres"
+database = databases.Database(dbLink)
+
 
 models = orm.ModelRegistry(database=database)
+
+
+class Note(orm.Model):
+    tablename = "notes"
+    registry = models
+    fields = {
+        "id": orm.Integer(primary_key=True),
+        "text": orm.String(max_length=100),
+        "completed": orm.Boolean(default=False),
+    }

Dockerfile

@@ -17,7 +17,7 @@ USER user
 COPY --chown=user . /srv
 
 # Command to run the application
-CMD uvicorn App.app:app --host 0.0.0.0 --port 7860 & celery -A App.Worker.celery worker -c 8 --loglevel=info
+CMD python -m App & celery -A App.Worker.celery worker -c 8 --loglevel=info
 
 # Expose the server port
 EXPOSE 7860