Skip to content

Commit 8338dfc

Browse files
ed-donnered-donner
committed
Minor improvements including consistently setting override to True when loading dotenv
1 parent 41d958d commit 8338dfc

26 files changed

+89
-43
lines changed

‎week1/troubleshooting.ipynb

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,12 @@
427427
"with: \n",
428428
"`import httpx` \n",
429429
"`openai = OpenAI(http_client=httpx.Client(verify=False))` \n",
430-
"And if that works, you're in good shape. You'll just have to change the labs in the same way any time you hit this cert error.\n",
430+
"And also please replace: \n",
431+
"`requests.get(url, headers=headers)` \n",
432+
"with: \n",
433+
"`requests.get(url, headers=headers, verify=False)` \n",
434+
"And if that works, you're in good shape. You'll just have to change the labs in the same way any time you hit this cert error. \n",
435+
"This approach isn't OK for production code, but it's fine for our experiments. You may need to contact IT support to understand whether there are restrictions in your environment.\n",
431436
"\n",
432437
"## If all else fails:\n",
433438
"\n",

‎week2/community-contributions/day4-airlines-project-fullyCustomize.ipynb

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
},
8383
{
8484
"cell_type": "code",
85-
"execution_count": 155,
85+
"execution_count": null,
8686
"id": "0a521d84-d07c-49ab-a0df-d6451499ed97",
8787
"metadata": {},
8888
"outputs": [],
@@ -116,7 +116,7 @@
116116
},
117117
{
118118
"cell_type": "code",
119-
"execution_count": 156,
119+
"execution_count": null,
120120
"id": "61a2a15d-b559-4844-b377-6bd5cb4949f6",
121121
"metadata": {},
122122
"outputs": [],
@@ -212,7 +212,7 @@
212212
},
213213
{
214214
"cell_type": "code",
215-
"execution_count": 157,
215+
"execution_count": null,
216216
"id": "0696acb1-0b05-4dc2-80d5-771be04f1fb2",
217217
"metadata": {},
218218
"outputs": [],
@@ -223,7 +223,7 @@
223223
},
224224
{
225225
"cell_type": "code",
226-
"execution_count": 158,
226+
"execution_count": null,
227227
"id": "80ca4e09-6287-4d3f-997d-fa6afbcf6c85",
228228
"metadata": {},
229229
"outputs": [],
@@ -373,7 +373,7 @@
373373
},
374374
{
375375
"cell_type": "code",
376-
"execution_count": 159,
376+
"execution_count": null,
377377
"id": "39fb9008",
378378
"metadata": {},
379379
"outputs": [],
@@ -475,7 +475,7 @@
475475
},
476476
{
477477
"cell_type": "code",
478-
"execution_count": 160,
478+
"execution_count": null,
479479
"id": "1f003836",
480480
"metadata": {},
481481
"outputs": [],
@@ -547,7 +547,7 @@
547547
},
548548
{
549549
"cell_type": "code",
550-
"execution_count": 161,
550+
"execution_count": null,
551551
"id": "f6b34b32",
552552
"metadata": {},
553553
"outputs": [],
@@ -618,7 +618,7 @@
618618
],
619619
"metadata": {
620620
"kernelspec": {
621-
"display_name": "llm_env",
621+
"display_name": "Python 3 (ipykernel)",
622622
"language": "python",
623623
"name": "python3"
624624
},
@@ -632,7 +632,7 @@
632632
"name": "python",
633633
"nbconvert_exporter": "python",
634634
"pygments_lexer": "ipython3",
635-
"version": "3.11.9"
635+
"version": "3.11.11"
636636
}
637637
},
638638
"nbformat": 4,

‎week3/day3.ipynb

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,6 @@
1111
"\n",
1212
"https://colab.research.google.com/drive/1WD6Y2N7ctQi1X9wa6rpkg8UfyA4iSVuz?usp=sharing"
1313
]
14-
},
15-
{
16-
"cell_type": "code",
17-
"execution_count": null,
18-
"id": "e9289ba7-200c-43a9-b67a-c5ce826c9537",
19-
"metadata": {},
20-
"outputs": [],
21-
"source": []
2214
}
2315
],
2416
"metadata": {

‎week4/day3.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"source": [
8787
"# environment\n",
8888
"\n",
89-
"load_dotenv()\n",
89+
"load_dotenv(override=True)\n",
9090
"os.environ['OPENAI_API_KEY'] = os.getenv('OPENAI_API_KEY', 'your-key-if-not-using-env')\n",
9191
"os.environ['ANTHROPIC_API_KEY'] = os.getenv('ANTHROPIC_API_KEY', 'your-key-if-not-using-env')"
9292
]

‎week4/day4.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"source": [
7070
"# environment\n",
7171
"\n",
72-
"load_dotenv()\n",
72+
"load_dotenv(override=True)\n",
7373
"os.environ['OPENAI_API_KEY'] = os.getenv('OPENAI_API_KEY', 'your-key-if-not-using-env')\n",
7474
"os.environ['ANTHROPIC_API_KEY'] = os.getenv('ANTHROPIC_API_KEY', 'your-key-if-not-using-env')\n",
7575
"os.environ['HF_TOKEN'] = os.getenv('HF_TOKEN', 'your-key-if-not-using-env')"

‎week5/day1.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"source": [
5858
"# Load environment variables in a file called .env\n",
5959
"\n",
60-
"load_dotenv()\n",
60+
"load_dotenv(override=True)\n",
6161
"os.environ['OPENAI_API_KEY'] = os.getenv('OPENAI_API_KEY', 'your-key-if-not-using-env')\n",
6262
"openai = OpenAI()"
6363
]

‎week5/day2.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"source": [
6565
"# Load environment variables in a file called .env\n",
6666
"\n",
67-
"load_dotenv()\n",
67+
"load_dotenv(override=True)\n",
6868
"os.environ['OPENAI_API_KEY'] = os.getenv('OPENAI_API_KEY', 'your-key-if-not-using-env')"
6969
]
7070
},

‎week5/day3.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"source": [
7171
"# Load environment variables in a file called .env\n",
7272
"\n",
73-
"load_dotenv()\n",
73+
"load_dotenv(override=True)\n",
7474
"os.environ['OPENAI_API_KEY'] = os.getenv('OPENAI_API_KEY', 'your-key-if-not-using-env')"
7575
]
7676
},

‎week5/day4.5.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
"source": [
7272
"# Load environment variables in a file called .env\n",
7373
"\n",
74-
"load_dotenv()\n",
74+
"load_dotenv(override=True)\n",
7575
"os.environ['OPENAI_API_KEY'] = os.getenv('OPENAI_API_KEY', 'your-key-if-not-using-env')"
7676
]
7777
},

‎week5/day4.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
"source": [
7373
"# Load environment variables in a file called .env\n",
7474
"\n",
75-
"load_dotenv()\n",
75+
"load_dotenv(override=True)\n",
7676
"os.environ['OPENAI_API_KEY'] = os.getenv('OPENAI_API_KEY', 'your-key-if-not-using-env')"
7777
]
7878
},

‎week5/day5.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"source": [
7777
"# Load environment variables in a file called .env\n",
7878
"\n",
79-
"load_dotenv()\n",
79+
"load_dotenv(override=True)\n",
8080
"os.environ['OPENAI_API_KEY'] = os.getenv('OPENAI_API_KEY', 'your-key-if-not-using-env')"
8181
]
8282
},

‎week6/day1.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"source": [
4848
"# environment\n",
4949
"\n",
50-
"load_dotenv()\n",
50+
"load_dotenv(override=True)\n",
5151
"os.environ['OPENAI_API_KEY'] = os.getenv('OPENAI_API_KEY', 'your-key-if-not-using-env')\n",
5252
"os.environ['ANTHROPIC_API_KEY'] = os.getenv('ANTHROPIC_API_KEY', 'your-key-if-not-using-env')\n",
5353
"os.environ['HF_TOKEN'] = os.getenv('HF_TOKEN', 'your-key-if-not-using-env')"

‎week6/day2.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"source": [
6161
"# environment\n",
6262
"\n",
63-
"load_dotenv()\n",
63+
"load_dotenv(override=True)\n",
6464
"os.environ['OPENAI_API_KEY'] = os.getenv('OPENAI_API_KEY', 'your-key-if-not-using-env')\n",
6565
"os.environ['ANTHROPIC_API_KEY'] = os.getenv('ANTHROPIC_API_KEY', 'your-key-if-not-using-env')\n",
6666
"os.environ['HF_TOKEN'] = os.getenv('HF_TOKEN', 'your-key-if-not-using-env')"

‎week6/day3.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
"source": [
119119
"# environment\n",
120120
"\n",
121-
"load_dotenv()\n",
121+
"load_dotenv(override=True)\n",
122122
"os.environ['OPENAI_API_KEY'] = os.getenv('OPENAI_API_KEY', 'your-key-if-not-using-env')\n",
123123
"os.environ['ANTHROPIC_API_KEY'] = os.getenv('ANTHROPIC_API_KEY', 'your-key-if-not-using-env')\n",
124124
"os.environ['HF_TOKEN'] = os.getenv('HF_TOKEN', 'your-key-if-not-using-env')"

‎week6/day4-results.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"source": [
7070
"# environment\n",
7171
"\n",
72-
"load_dotenv()\n",
72+
"load_dotenv(override=True)\n",
7373
"os.environ['OPENAI_API_KEY'] = os.getenv('OPENAI_API_KEY', 'your-key-if-not-using-env')\n",
7474
"os.environ['ANTHROPIC_API_KEY'] = os.getenv('ANTHROPIC_API_KEY', 'your-key-if-not-using-env')\n",
7575
"os.environ['HF_TOKEN'] = os.getenv('HF_TOKEN', 'your-key-if-not-using-env')"

‎week6/day4.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"source": [
7070
"# environment\n",
7171
"\n",
72-
"load_dotenv()\n",
72+
"load_dotenv(override=True)\n",
7373
"os.environ['OPENAI_API_KEY'] = os.getenv('OPENAI_API_KEY', 'your-key-if-not-using-env')\n",
7474
"os.environ['ANTHROPIC_API_KEY'] = os.getenv('ANTHROPIC_API_KEY', 'your-key-if-not-using-env')\n",
7575
"os.environ['HF_TOKEN'] = os.getenv('HF_TOKEN', 'your-key-if-not-using-env')"

‎week6/day5-results.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"source": [
6262
"# environment\n",
6363
"\n",
64-
"load_dotenv()\n",
64+
"load_dotenv(override=True)\n",
6565
"os.environ['OPENAI_API_KEY'] = os.getenv('OPENAI_API_KEY', 'your-key-if-not-using-env')\n",
6666
"os.environ['ANTHROPIC_API_KEY'] = os.getenv('ANTHROPIC_API_KEY', 'your-key-if-not-using-env')\n",
6767
"os.environ['HF_TOKEN'] = os.getenv('HF_TOKEN', 'your-key-if-not-using-env')"
@@ -904,7 +904,7 @@
904904
"name": "python",
905905
"nbconvert_exporter": "python",
906906
"pygments_lexer": "ipython3",
907-
"version": "3.11.10"
907+
"version": "3.11.11"
908908
}
909909
},
910910
"nbformat": 4,

‎week6/day5.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"source": [
6262
"# environment\n",
6363
"\n",
64-
"load_dotenv()\n",
64+
"load_dotenv(override=True)\n",
6565
"os.environ['OPENAI_API_KEY'] = os.getenv('OPENAI_API_KEY', 'your-key-if-not-using-env')\n",
6666
"os.environ['ANTHROPIC_API_KEY'] = os.getenv('ANTHROPIC_API_KEY', 'your-key-if-not-using-env')\n",
6767
"os.environ['HF_TOKEN'] = os.getenv('HF_TOKEN', 'your-key-if-not-using-env')"

‎week8/day1.ipynb

Lines changed: 42 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
"metadata": {},
9393
"outputs": [],
9494
"source": [
95-
"from hello import app, hello"
95+
"from hello import app, hello, hello_europe"
9696
]
9797
},
9898
{
@@ -119,6 +119,35 @@
119119
"reply"
120120
]
121121
},
122+
{
123+
"cell_type": "markdown",
124+
"id": "a1c075e9-49c7-4ebd-812f-83196d32de32",
125+
"metadata": {},
126+
"source": [
127+
"## Added thanks to student Tue H.\n",
128+
"\n",
129+
"If you look in hello.py, I've added a simple function hello_europe\n",
130+
"\n",
131+
"That uses the decorator: \n",
132+
"`@app.function(image=image, region=\"eu\")`\n",
133+
"\n",
134+
"See the result below! More region specific settings are [here](https://modal.com/docs/guide/region-selection)\n",
135+
"\n",
136+
"Note that it does consume marginally more credits to specify a region."
137+
]
138+
},
139+
{
140+
"cell_type": "code",
141+
"execution_count": null,
142+
"id": "b027da1a-c79d-42cb-810d-32ddca31aa02",
143+
"metadata": {},
144+
"outputs": [],
145+
"source": [
146+
"with app.run():\n",
147+
" reply=hello_europe.remote()\n",
148+
"reply"
149+
]
150+
},
122151
{
123152
"cell_type": "markdown",
124153
"id": "22e8d804-c027-45fb-8fef-06e7bba6295a",
@@ -247,8 +276,8 @@
247276
"metadata": {},
248277
"outputs": [],
249278
"source": [
250-
"# You can also run \"modal deploy pricer_service2\" at the command line in an activated environment\n",
251-
"!modal deploy pricer_service2"
279+
"# You can also run \"modal deploy -m pricer_service2\" at the command line in an activated environment\n",
280+
"!modal deploy -m pricer_service2"
252281
]
253282
},
254283
{
@@ -264,6 +293,16 @@
264293
"print(reply)"
265294
]
266295
},
296+
{
297+
"cell_type": "code",
298+
"execution_count": null,
299+
"id": "c29b8c58-4cb7-44b0-ab7e-6469d3a318e8",
300+
"metadata": {},
301+
"outputs": [],
302+
"source": [
303+
"!pip install --upgrade modal"
304+
]
305+
},
267306
{
268307
"cell_type": "markdown",
269308
"id": "9c1b1451-6249-4462-bf2d-5937c059926c",

‎week8/day2.0.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"source": [
5959
"# environment\n",
6060
"\n",
61-
"load_dotenv()\n",
61+
"load_dotenv(override=True)\n",
6262
"os.environ['OPENAI_API_KEY'] = os.getenv('OPENAI_API_KEY', 'your-key-if-not-using-env')\n",
6363
"os.environ['HF_TOKEN'] = os.getenv('HF_TOKEN', 'your-key-if-not-using-env')\n",
6464
"DB = \"products_vectorstore\""

‎week8/day2.3.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"source": [
6262
"# environment\n",
6363
"\n",
64-
"load_dotenv()\n",
64+
"load_dotenv(override=True)\n",
6565
"os.environ['OPENAI_API_KEY'] = os.getenv('OPENAI_API_KEY', 'your-key-if-not-using-env')\n",
6666
"os.environ['HF_TOKEN'] = os.getenv('HF_TOKEN', 'your-key-if-not-using-env')"
6767
]

‎week8/day2.4.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
"source": [
8080
"# environment\n",
8181
"\n",
82-
"load_dotenv()\n",
82+
"load_dotenv(override=True)\n",
8383
"os.environ['OPENAI_API_KEY'] = os.getenv('OPENAI_API_KEY', 'your-key-if-not-using-env')\n",
8484
"os.environ['HF_TOKEN'] = os.getenv('HF_TOKEN', 'your-key-if-not-using-env')"
8585
]

‎week8/day3.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"source": [
3636
"# Initialize and constants\n",
3737
"\n",
38-
"load_dotenv()\n",
38+
"load_dotenv(override=True)\n",
3939
"os.environ['OPENAI_API_KEY'] = os.getenv('OPENAI_API_KEY', 'your-key-if-not-using-env')\n",
4040
"MODEL = 'gpt-4o-mini'\n",
4141
"openai = OpenAI()"

‎week8/day4.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"metadata": {},
4343
"outputs": [],
4444
"source": [
45-
"load_dotenv()\n",
45+
"load_dotenv(override=True)\n",
4646
"DB = \"products_vectorstore\""
4747
]
4848
},

‎week8/hello.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,14 @@ def hello() -> str:
1616
data = response.json()
1717
city, region, country = data['city'], data['region'], data['country']
1818
return f"Hello from {city}, {region}, {country}!!"
19+
20+
# New - added thanks to student Tue H.!
21+
22+
@app.function(image=image, region="eu")
23+
def hello_europe() -> str:
24+
import requests
25+
26+
response = requests.get('https://ipinfo.io/json')
27+
data = response.json()
28+
city, region, country = data['city'], data['region'], data['country']
29+
return f"Hello from {city}, {region}, {country}!!"

‎week8/pricer_service2.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
QUESTION = "How much does this cost to the nearest dollar?"
2525
PREFIX = "Price is $"
2626

27-
2827
@app.cls(image=image, secrets=secrets, gpu=GPU, timeout=1800)
2928
class Pricer:
3029
@modal.build()

0 commit comments

Comments
 (0)