From a1cd181f2eee23d59120c0083ed04a106162dd1e Mon Sep 17 00:00:00 2001 From: nssuu Date: Sun, 9 Feb 2025 03:44:09 +0300 Subject: [PATCH] Fix redundant code lines --- ...ay2-webpage-summarizer-ollama-gemini.ipynb | 59 ++++++++----------- 1 file changed, 26 insertions(+), 33 deletions(-) diff --git a/week1/community-contributions/day2-webpage-summarizer-ollama-gemini.ipynb b/week1/community-contributions/day2-webpage-summarizer-ollama-gemini.ipynb index e2d095b..60d5840 100644 --- a/week1/community-contributions/day2-webpage-summarizer-ollama-gemini.ipynb +++ b/week1/community-contributions/day2-webpage-summarizer-ollama-gemini.ipynb @@ -20,7 +20,7 @@ }, { "cell_type": "code", - "execution_count": 1, + "execution_count": 12, "id": "be06ce76-20ee-4066-9582-a4ed745f278f", "metadata": {}, "outputs": [], @@ -35,33 +35,32 @@ }, { "cell_type": "code", - "execution_count": null, - "id": "f3a93b10-f528-4e68-bb95-942596cad52e", - "metadata": {}, - "outputs": [], - "source": [ - "load_dotenv()\n", - "api_key = os.getenv(\"GEMINI_API_KEY\")\n", - "\n", - "if not api_key or len(api_key) < 39:\n", - " print(\"No correct api key was found\")\n", - "else:\n", - " print(\"Api key found. Good to go!\")" - ] - }, - { - "cell_type": "code", - "execution_count": 3, - "id": "37e7b93f-faf7-415d-8d8c-35e81c6388d3", + "execution_count": 13, + "id": "99e42519-5dac-4b13-8a26-8a635753343b", "metadata": {}, "outputs": [], "source": [ - "client = genai.Client(api_key=api_key)" + "def gemini_invoke(website):\n", + " load_dotenv()\n", + " api_key = os.getenv(\"GEMINI_API_KEY\")\n", + " if not api_key or len(api_key) < 39:\n", + " print(\"No correct api key was found\")\n", + " return\n", + " else:\n", + " print(\"Api key found. Good to go!\")\n", + " client = genai.Client(api_key=api_key)\n", + " response = client.models.generate_content(\n", + " model=\"gemini-2.0-flash\",\n", + " config=types.GenerateContentConfig(\n", + " system_instruction=system_prompt),\n", + " contents=user_prompt_for(website)\n", + " )\n", + " return response.text" ] }, { "cell_type": "code", - "execution_count": 4, + "execution_count": 14, "id": "95a6ece8-8402-4cad-96b9-36a6ea444c54", "metadata": {}, "outputs": [], @@ -97,7 +96,7 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": 15, "id": "233b8904-7a4a-4265-8b0d-20934ae4b29c", "metadata": {}, "outputs": [], @@ -109,7 +108,7 @@ }, { "cell_type": "code", - "execution_count": 13, + "execution_count": 16, "id": "5c996c03-84ab-4378-8a55-026d94404d35", "metadata": {}, "outputs": [], @@ -119,7 +118,7 @@ }, { "cell_type": "code", - "execution_count": 14, + "execution_count": 17, "id": "abf9464e-dc8d-4099-aeb6-495498326673", "metadata": {}, "outputs": [], @@ -135,7 +134,7 @@ }, { "cell_type": "code", - "execution_count": 15, + "execution_count": 20, "id": "32ab2d29-02d1-43c5-b920-f2621f292b23", "metadata": {}, "outputs": [], @@ -149,13 +148,7 @@ " response = ollama.chat(model=Model, messages=messages)\n", " return response[\"message\"][\"content\"]\n", " else:\n", - " response = client.models.generate_content(\n", - " model=\"gemini-2.0-flash\",\n", - " config=types.GenerateContentConfig(\n", - " system_instruction=system_prompt),\n", - " contents=user_prompt_for(website)\n", - " )\n", - " return response.text" + " return gemini_invoke(website)" ] }, { @@ -165,7 +158,7 @@ "metadata": {}, "outputs": [], "source": [ - "summarize(\"https://edwarddonner.com\", \"gemini\")" + "summarize(\"https://edwarddonner.com\", \"ollama\")" ] } ],