Skip to content

Change env var setup #202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidsklar99 merged 4 commits into from
Aug 8, 2025
Merged

Change env var setup #202

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
437063e
Change env var setup
davidsklar99 Aug 8, 2025
c231655
Format code and sort imports
davidsklar99 Aug 8, 2025
626351e
Update env
davidsklar99 Aug 8, 2025
2670b0f
Merge branch 'stats-post' of https://github.com/UW-Macrostrat/macrost…
davidsklar99 Aug 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion services/usage-stats/src/insert.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,17 @@

load_dotenv()

DATABASE_URL = os.getenv("DATABASE_URL")
raw_url = os.getenv("DATABASE_URL", "postgresql://user:pass@localhost:5432/dbname")

# Ensure it uses asyncpg
if raw_url.startswith("postgresql://"):
raw_url = raw_url.replace("postgresql://", "postgresql+asyncpg://", 1)
elif not raw_url.startswith("postgresql+asyncpg://"):
raise ValueError(
"Invalid DATABASE_URL: must start with postgresql:// or postgresql+asyncpg://"
)

DATABASE_URL = raw_url

engine = create_async_engine(DATABASE_URL, echo=True)

Expand Down
12 changes: 11 additions & 1 deletion services/usage-stats/src/last_id.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,17 @@

load_dotenv()

DATABASE_URL = os.getenv("DATABASE_URL")
raw_url = os.getenv("DATABASE_URL", "postgresql://user:pass@localhost:5432/dbname")

# Ensure it uses asyncpg
if raw_url.startswith("postgresql://"):
raw_url = raw_url.replace("postgresql://", "postgresql+asyncpg://", 1)
elif not raw_url.startswith("postgresql+asyncpg://"):
raise ValueError(
"Invalid DATABASE_URL: must start with postgresql:// or postgresql+asyncpg://"
)

DATABASE_URL = raw_url

engine = create_async_engine(DATABASE_URL, echo=True)

Expand Down
15 changes: 11 additions & 4 deletions services/usage-stats/src/macrostrat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,17 @@

BATCH_SIZE = 1000 # Adjust as needed

# Database URL format: mysql+asyncmy://user:password@host:port/database
DATABASE_URL = os.getenv(
"MARIADB_URL", "mysql+asyncmy://user:password@localhost:3306/database"
)
raw_url = os.getenv("MARIADB_URL", "mysql://user:password@localhost:3306/database")

# Ensure the URL uses asyncmy driver
if raw_url.startswith("mysql://"):
raw_url = raw_url.replace("mysql://", "mysql+asyncmy://", 1)
elif not raw_url.startswith("mysql+asyncmy://"):
raise ValueError(
"Invalid DATABASE_URL: must start with mysql:// or mysql+asyncmy://"
)

DATABASE_URL = raw_url

# Create async engine
engine = create_async_engine(DATABASE_URL, echo=True)
Expand Down
15 changes: 11 additions & 4 deletions services/usage-stats/src/rockd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,17 @@

BATCH_SIZE = 1000 # Adjust batch size as needed

# Database URL format: mysql+asyncmy://user:password@host:port/database
DATABASE_URL = os.getenv(
"MARIADB_URL", "mysql+asyncmy://user:password@localhost:3306/database"
)
raw_url = os.getenv("MARIADB_URL", "mysql://user:password@localhost:3306/database")

# Ensure the URL uses asyncmy driver
if raw_url.startswith("mysql://"):
raw_url = raw_url.replace("mysql://", "mysql+asyncmy://", 1)
elif not raw_url.startswith("mysql+asyncmy://"):
raise ValueError(
"Invalid DATABASE_URL: must start with mysql:// or mysql+asyncmy://"
)

DATABASE_URL = raw_url

# Create async SQLAlchemy engine
engine = create_async_engine(DATABASE_URL, echo=True)
Expand Down