Spaces:

Ferrxni
/

Gaia_Mistral

Paused

App Files Files Community

MarkPiq commited on Feb 26

Commit

b865a2a

•

1 Parent(s): f8b5c48

ajout demande ville

Browse files

Files changed (5) hide show

Notebook_Ferro.ipynb +16 -1
Weather.json +5 -0
app.py +107 -104
user_location.json +1 -0
weather.py +41 -0

Notebook_Ferro.ipynb CHANGED Viewed

@@ -31,6 +31,21 @@
     "load_dotenv()"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": 57,
@@ -361,7 +376,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.5"
   }
  },
  "nbformat": 4,

     "load_dotenv()"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": 2,
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "Today's date: 2024-02-26\n"
+     ]
+    }
+   ],
+   "source": []
+  },
   {
    "cell_type": "code",
    "execution_count": 57,
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
+   "version": "3.11.4"
   }
  },
  "nbformat": 4,

Weather.json ADDED Viewed

	@@ -0,0 +1,5 @@

+{
+    "temperature": 20,
+    "humidity": 60,
+    "pression": 1000
+}

app.py CHANGED Viewed

@@ -2,8 +2,6 @@ import os
 import sys
 from datetime import datetime
 from pathlib import Path
-import gradio as gr
 import plotly.graph_objects as go
 import uvicorn
 from dotenv import load_dotenv
@@ -13,7 +11,13 @@ from mistralai.client import ChatMessage, MistralClient
 from pydantic import BaseModel
 from fastapi import Depends
 import json
-from fastapi.responses import HTMLResponse
 # Load environment variables
@@ -42,39 +46,8 @@ app.mount("/static", StaticFiles(directory=static_dir), name="static")
 # Gradio stuff
-def predict(text_input):
-    file_name = f"{datetime.utcnow().strftime('%s')}.html"
-    file_path = static_dir / file_name
-    print(file_path)
-    with open(file_path, "w") as f:
-        f.write(f"""
-        <script src="https://cdn.tailwindcss.com"></script>
-        <body class="bg-gray-200 dark:text-white dark:bg-gray-900">
-        <h1 class="text-3xl font-bold">
-        Hello <i>{text_input}</i> From Gradio Iframe
-        </h1>
-        <h3>Filename: {file_name}</h3>
-        """)
-    iframe = f"""<iframe src="/static/{file_name}" width="100%" height="500px"></iframe>"""
-    link = f'<a href="/static/{file_name}" target="_blank">{file_name}</a>'
-    return link, iframe
-with gr.Blocks() as block:
-    gr.Markdown("""
-## Gradio + FastAPI + Static Server
-This is a demo of how to use Gradio with FastAPI and a static server.
-The Gradio app generates dynamic HTML files and stores them in a static directory. FastAPI serves the static files.
-""")
-    with gr.Row():
-        with gr.Column():
-            text_input = gr.Textbox(label="Name")
-            markdown = gr.Markdown(label="Output Box")
-            new_btn = gr.Button("New")
-        with gr.Column():
-            html = gr.HTML(label="HTML preview", show_label=True)
-    new_btn.click(fn=predict, inputs=[text_input], outputs=[markdown, html])
 def create_world_map(lat, lon):
@@ -104,21 +77,6 @@ def create_world_map(lat, lon):
     return fig
-# # Fake JSON data for the user profile
-# user_profile_data = {
-#     "name": "John Doe",
-#     "age": 30,
-#     "location": "Montreal",
-#     "lat": 45.5017,
-#     "lon": -73.5673
-# }
-# #as a JSON:
-# with open('user_profile.json', 'w') as f:
-#     json.dump(user_profile_data, f)
-# Mistral AI Chat
 def chat_with_mistral(user_input):
     messages = [ChatMessage(role="user", content=user_input)]
@@ -126,36 +84,6 @@ def chat_with_mistral(user_input):
     return chat_response.choices[0].message.content
-### FRONTEND ###
-def create_gradio_dashboard():
-    with gr.Blocks() as demo:
-        # Mistral AI Chat
-        with gr.Column():
-            with gr.Row():
-                user_input = gr.Textbox (lines=2, placeholder=placeholder)
-                send_chat_btn = gr.Button(value="Send")
-                update_map_btn = gr.Button(value="Update Map")
-            chat_output = gr.Textbox(lines=2, placeholder="Réponse")
-        # Profile
-        with gr.Row():
-            name = gr.Textbox(label="Name")
-            age = gr.Number(label="Age")
-            location = gr.Textbox(label="Location")
-            lat = gr.Number(value=45.5017, label="Latitude")
-            lon = gr.Number(value=-73.5673, label="Longitude")
-            load_user_profile_btn = gr.Button(value="Load User Profile")
-            save_user_profile_btn = gr.Button(value="Save User Profile")
-        # Map
-        with gr.Row():
-            map = gr.Plot()
-        # Mistral AI Chat
-        demo.load(chat_with_mistral, user_input, chat_output)
-        send_chat_btn.click(chat_with_mistral, user_input, chat_output)
-    return demo
 # Profile stuff
@@ -166,6 +94,16 @@ class UserProfile(BaseModel):
     lat: float
     lon: float
 @app.post("/user_profile")
 def save_user_profile(user_profile: UserProfile):
     with open('user_profile.json', 'w') as f:
@@ -177,16 +115,38 @@ def load_user_profile():
     with open('user_profile.json', 'r') as f:
         user_profile = json.load(f)
     return UserProfile(**user_profile)
 @app.put("/user_profile")
 def update_user_profile(user_profile: UserProfile):
     with open('user_profile.json', 'w') as f:
         json.dump(user_profile.dict(), f)
     return user_profile
 # load user profile on startup
 user_profile = load_user_profile()
 ### BACKEND ###
 @app.get("/meteo")
@@ -194,14 +154,57 @@ async def read_meteo(location: str, date: str):
     # API call to get the weather
     pass
-# Home page : using the user profile, display the weather and chat with Mistral AI
 @app.get("/", response_class=HTMLResponse)
-async def home(user_profile: UserProfile = Depends(load_user_profile)):
     #1st : display as background the map of the user location:
     # get the user location
     lat = user_profile.lat
     lon = user_profile.lon
     # create the map
     fig = create_world_map(lat, lon)
     # save the map as a file
@@ -210,25 +213,25 @@ async def home(user_profile: UserProfile = Depends(load_user_profile)):
     # display the map
     map_html = f'<iframe src="/static/map.html" width="100%" height="500px"></iframe>'
-    #2nd : gradio dashboard on top of the map to toggle the user profile and display chat with Mistral AI
-    # create the gradio dashboard
-    # gradio_dashboard = create_gradio_dashboard()
-    # save the dashboard as a file
-    # dashboard_file = static_dir / "dashboard.html"
-    # gradio_dashboard.save(dashboard_file)
-    # # display the dashboard
-    # dashboard_html = f'<iframe src="/static/dashboard.html" width="100%" height="500px"></iframe>'
     return f"""
-    <h1>Welcome to the home page</h1>
-    <h2>User Profile</h2>
-    <p>Name: {user_profile.name}</p>
-    <p>Age: {user_profile.age}</p>
-    <p>Location: {user_profile.location}</p>
-    <p>Latitude: {user_profile.lat}</p>
-    <p>Longitude: {user_profile.lon}</p>
-    <h2>Map</h2>
-    {map_html}
-    """
     # <h2>Gradio Dashboard</h2>
     # {dashboard_html}

 import sys
 from datetime import datetime
 from pathlib import Path
 import plotly.graph_objects as go
 import uvicorn
 from dotenv import load_dotenv
 from pydantic import BaseModel
 from fastapi import Depends
 import json
+from fastapi.responses import HTMLResponse, RedirectResponse, Response
+from datetime import date
+from weather import get_weather
+# code that gives the date of today
+today = date.today()
+today = today.strftime("%Y-%m-%d")
 # Load environment variables
 # Gradio stuff
 def create_world_map(lat, lon):
     return fig
 def chat_with_mistral(user_input):
     messages = [ChatMessage(role="user", content=user_input)]
     return chat_response.choices[0].message.content
 # Profile stuff
     lat: float
     lon: float
+class UserLocation(BaseModel):
+    city: str
+class Weather(BaseModel):
+    temperature: float
+    humidity: float
+    pression: float
 @app.post("/user_profile")
 def save_user_profile(user_profile: UserProfile):
     with open('user_profile.json', 'w') as f:
     with open('user_profile.json', 'r') as f:
         user_profile = json.load(f)
     return UserProfile(**user_profile)
 @app.put("/user_profile")
 def update_user_profile(user_profile: UserProfile):
     with open('user_profile.json', 'w') as f:
         json.dump(user_profile.dict(), f)
     return user_profile
+@app.get("/weather")
+def load_weather():
+    with open('Weather.json', 'r') as f:
+        w = json.load(f)
+    return Weather(**w)
+# @app.post("/user_location")
+# async def set_user_location(user_location: UserLocation):
+#     # Save the user location as a JSON file
+#     with open('user_location.json', 'w') as f:
+#         json.dump(user_location.dict(), f)
+#     return RedirectResponse(url='/home')
+@app.post("/user_location")
+async def set_user_location(user_location: UserLocation):
+    # Save the user location as a JSON file
+    with open('user_location.json', 'w') as f:
+        json.dump(user_location.dict(), f)
+    response = Response(headers={"Location": "/home"})
+    response.status_code = 303
+    return response
 # load user profile on startup
 user_profile = load_user_profile()
+weather=load_weather()
 ### BACKEND ###
 @app.get("/meteo")
     # API call to get the weather
     pass
+# On récupère les infos sur la ville. On les sauvegarde dans un fichier JSON
 @app.get("/", response_class=HTMLResponse)
+async def enter_location():
+    return """
+    <form id="locationForm">
+        <label for="city">Enter your city:</label><br>
+        <input type="text" id="city" name="city"><br>
+        <input type="submit" value="Submit">
+    </form>
+    <script>
+    document.getElementById('locationForm').addEventListener('submit', function(event) {
+        event.preventDefault();
+        var city = document.getElementById('city').value;
+        fetch('/user_location', {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({city: city}),
+        })
+        .then(response => {
+            if (response.redirected) {
+                window.location.href = '/home';
+            }
+        });
+    });
+    </script>
+    """
+# Home page : using the user profile, display the weather and chat with Mistral AI
+@app.get("/home", response_class=HTMLResponse)
+async def home(user_profile: UserProfile = Depends(load_user_profile), Weather: Weather = Depends(load_weather)):
     #1st : display as background the map of the user location:
     # get the user location
     lat = user_profile.lat
     lon = user_profile.lon
+    temperature = Weather.temperature
+    humidity = Weather.humidity
+    pression = Weather.pression
     # create the map
     fig = create_world_map(lat, lon)
     # save the map as a file
     # display the map
     map_html = f'<iframe src="/static/map.html" width="100%" height="500px"></iframe>'
     return f"""
+        <center>
+        <h1>Bienvenu !</h1></center>
+        <div style="display: flex;">
+            <div style="flex: 50%;">
+                <h2>Informations du jour</h2>
+                <p>temperature: {temperature}</p>
+                <p>humidity: {humidity}</p>
+                <p>pression: {pression}</p>
+                <h2>Map</h2>
+                {map_html}
+            </div>
+            <div style="flex: 50%;">
+                <h2>Avez-vous une question ?</h2>
+                <textarea style="width: 100%; height: 500px;"></textarea>
+            </div>
+        </div>
+        """
     # <h2>Gradio Dashboard</h2>
     # {dashboard_html}

user_location.json ADDED Viewed

	@@ -0,0 +1 @@


1	+ {"city": "Lyon"}

weather.py ADDED Viewed

	@@ -0,0 +1,41 @@

+import requests
+import json
+import datetime
+from pprint import pprint
+from datetime import date
+def get_weather(city, date):
+    agro_api_key = "88aaa872e29fedb008a2ffd240ebdf56"
+    opencage_api_key = "bade196e8eac4d33b72dba6d9e40285a"
+    # On récupère les lat et lon de la ville
+    geocode_url = f"https://api.opencagedata.com/geocode/v1/json?q={city}&key={opencage_api_key}"
+    geocode_response = requests.get(geocode_url)
+    geocode_data = geocode_response.json()
+    latitude = geocode_data['results'][0]['geometry']['lat']
+    longitude = geocode_data['results'][0]['geometry']['lng']
+    # On demande la météo pour cette ville
+    forecast_url = f"http://api.agromonitoring.com/agro/1.0/weather/forecast?lat={latitude}&lon={longitude}&appid={agro_api_key}"
+    forecast_response = requests.get(forecast_url)
+    if forecast_response.status_code == 200:
+        forecast_data = forecast_response.json()
+        d={}
+        for forecast in forecast_data:
+            datew = datetime.datetime.fromtimestamp(forecast['dt'])
+            temperature = forecast['main']['temp']
+            weather_description = forecast['weather'][0]['description']
+            if str(datew).split(' ')[0]==str(date) :
+                d[str(datew)]=f"Location : {city}, Temperature: {round(temperature-273.15,2)}°C, Weather: {weather_description}"
+        return d
+    else:
+        print(f"Error: {forecast_response.status_code}")
+# #exemple
+# today = date.today()
+# today = today.strftime("%Y-%m-%d")
+# a=get_weather('Paris',today)
+# print(a)