Skip to content
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

Jump to bottom

renames secrets, minor text fixes #636

Merged
merged 2 commits into from
Mar 7, 2024
Merged

renames secrets, minor text fixes #636

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3cfad8
renames secrets, minor text fixes
charlesfrye Mar 7, 2024
559cfde
eating my own medicine with example pinning
charlesfrye Mar 7, 2024
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
22 changes: 14 additions & 8 deletions 04_secrets/db_to_sheet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#
# First we will enter our database credentials. The easiest way to do this is to click **New
# secret** and select the **Postgres compatible** secret preset and fill in the requested
# information. Then we press **Next** and name our secret "analytics-database" and click **Create**.
# information. Then we press **Next** and name our secret "example-postgres-secret" and click **Create**.
#
# ### Google Sheets/GCP
#
Expand All @@ -37,7 +37,7 @@
# 8. A json key file should be downloaded to your computer at this point. Copy the contents of that
# file and use it as the value for the **SERVICE_ACCOUNT_JSON** field in your new secret.
#
# We'll name this other secret "gsheets".
# We'll name this other secret "gsheets-secret".
#
# Now you can access the values of your secrets from modal functions that you annotate with the
# corresponding EnvDict includes, e.g.:
Expand All @@ -49,7 +49,7 @@
stub = modal.Stub("example-db-to-sheet")


@stub.function(secrets=[modal.Secret.from_name("postgres-secret")])
@stub.function(secrets=[modal.Secret.from_name("example-postgres-secret")])
def my_func():
# automatically filled from the specified secret
print("Host is " + os.environ["PGHOST"])
Expand All @@ -62,7 +62,9 @@ def my_func():
# the psycopg2 package itself:

pg_image = (
modal.Image.debian_slim().apt_install("libpq-dev").pip_install("psycopg2")
modal.Image.debian_slim(python_version="3.11")
.apt_install("libpq-dev")
.pip_install("psycopg2~=2.9.9")
)

# Since the default keynames for a **Postgres compatible** secret correspond to the environment
Expand All @@ -73,7 +75,7 @@ def my_func():

@stub.function(
image=pg_image,
secrets=[modal.Secret.from_name("postgres-secret")],
secrets=[modal.Secret.from_name("example-postgres-secret")],
)
def get_db_rows():
import psycopg2
Expand All @@ -92,10 +94,12 @@ def get_db_rows():
#
# For each city in our source data we'll make an online lookup of the current weather using the
# [http://openweathermap.org](http://openweathermap.org) API. To do this, we'll add the API key to
# another modal secret. We'll use a custom secret called "weather" with the key
# another modal secret. We'll use a custom secret called "weather-secret" with the key
# `OPENWEATHER_API_KEY` containing our API key for OpenWeatherMap.

requests_image = modal.Image.debian_slim().pip_install("requests")
requests_image = modal.Image.debian_slim(python_version="3.11").pip_install(
"requests~=2.31.0"
)


@stub.function(
Expand Down Expand Up @@ -164,7 +168,9 @@ def main():
# we'll refer to in our code. We'll make use of the `pygsheets` python package to authenticate with
# Google Sheets and then update the spreadsheet with information from the report we just created:

pygsheets_image = modal.Image.debian_slim().pip_install("pygsheets")
pygsheets_image = modal.Image.debian_slim(python_version="3.11").pip_install(
"pygsheets~=2.0.6"
)


@stub.function(
Expand Down
Loading