Updating Files
هذا الالتزام موجود في:
ahmedgamalyousef
1
.github/workflows/cicd.yaml
مباع
1
.github/workflows/cicd.yaml
مباع
@@ -75,3 +75,4 @@ jobs:
|
||||
|
||||
- name: 🚀 Deploy Application
|
||||
run: $HOME/ghaymah/bin/gy resource app launch
|
||||
|
||||
|
||||
@@ -16,4 +16,3 @@ RUN echo '<!DOCTYPE html><html><head><title>Weather App</title></head><body><h1>
|
||||
EXPOSE 5000
|
||||
|
||||
CMD ["python", "app.py"]
|
||||
|
||||
|
||||
@@ -180,5 +180,3 @@ https://<your-app-name>.hosted.ghaymah.systems
|
||||
|
||||
## 🎥 Project Record
|
||||
[Watch the Demo](https://app.gitpasha.com/AhmedGamalYousef/Complete-CI-CD-Project-pipeline-on-Ghaymah-Cloud/src/branch/main/demo/CICDonGhaymahCloud.mp4)
|
||||
|
||||
|
||||
|
||||
74
app.py
74
app.py
@@ -1,13 +1,14 @@
|
||||
from flask import Flask, request, jsonify, render_template_string
|
||||
import requests
|
||||
import os
|
||||
from datetime import datetime
|
||||
|
||||
import requests
|
||||
from flask import Flask, jsonify, render_template_string, request
|
||||
|
||||
app = Flask(__name__)
|
||||
|
||||
# Get API key from environment variable (preferred) or use demo key
|
||||
API_KEY = os.getenv('API_KEY', '6cf356ceb2ec0ff941855d4a43144e0e')
|
||||
BASE_URL = 'https://api.openweathermap.org/data/2.5/weather'
|
||||
API_KEY = os.getenv("API_KEY", "6cf356ceb2ec0ff941855d4a43144e0e")
|
||||
BASE_URL = "https://api.openweathermap.org/data/2.5/weather"
|
||||
|
||||
# HTML Template with embedded CSS and JavaScript - MUST BE DEFINED BEFORE ROUTES
|
||||
HTML_TEMPLATE = """
|
||||
@@ -378,6 +379,7 @@ HTML_TEMPLATE = """
|
||||
</html>
|
||||
"""
|
||||
|
||||
|
||||
def get_weather(city):
|
||||
"""Fetch weather data from OpenWeatherMap API"""
|
||||
try:
|
||||
@@ -386,25 +388,29 @@ def get_weather(city):
|
||||
response.raise_for_status() # Raises an HTTPError for bad responses
|
||||
|
||||
data = response.json()
|
||||
main = data['main']
|
||||
weather = data['weather'][0]
|
||||
sys = data.get('sys', {})
|
||||
main = data["main"]
|
||||
weather = data["weather"][0]
|
||||
sys = data.get("sys", {})
|
||||
|
||||
return {
|
||||
'city': data['name'],
|
||||
'country': sys.get('country', ''),
|
||||
'temperature': round(main['temp']),
|
||||
'feels_like': round(main['feels_like']),
|
||||
'description': weather['description'].title(),
|
||||
'humidity': main['humidity'],
|
||||
'pressure': main['pressure'],
|
||||
'wind_speed': round(data['wind']['speed'], 1),
|
||||
'wind_deg': data['wind'].get('deg', 0),
|
||||
'visibility': data.get('visibility', 0),
|
||||
'icon': weather['icon'],
|
||||
'sunrise': datetime.fromtimestamp(sys.get('sunrise', 0)).strftime('%H:%M') if sys.get('sunrise') else 'N/A',
|
||||
'sunset': datetime.fromtimestamp(sys.get('sunset', 0)).strftime('%H:%M') if sys.get('sunset') else 'N/A',
|
||||
'timestamp': datetime.now().strftime('%Y-%m-%d %H:%M:%S')
|
||||
"city": data["name"],
|
||||
"country": sys.get("country", ""),
|
||||
"temperature": round(main["temp"]),
|
||||
"feels_like": round(main["feels_like"]),
|
||||
"description": weather["description"].title(),
|
||||
"humidity": main["humidity"],
|
||||
"pressure": main["pressure"],
|
||||
"wind_speed": round(data["wind"]["speed"], 1),
|
||||
"wind_deg": data["wind"].get("deg", 0),
|
||||
"visibility": data.get("visibility", 0),
|
||||
"icon": weather["icon"],
|
||||
"sunrise": datetime.fromtimestamp(sys.get("sunrise", 0)).strftime("%H:%M")
|
||||
if sys.get("sunrise")
|
||||
else "N/A",
|
||||
"sunset": datetime.fromtimestamp(sys.get("sunset", 0)).strftime("%H:%M")
|
||||
if sys.get("sunset")
|
||||
else "N/A",
|
||||
"timestamp": datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
|
||||
}
|
||||
except requests.exceptions.RequestException as e:
|
||||
print(f"API request failed: {e}")
|
||||
@@ -413,29 +419,33 @@ def get_weather(city):
|
||||
print(f"Error parsing weather data: {e}")
|
||||
return None
|
||||
|
||||
@app.route('/')
|
||||
|
||||
@app.route("/")
|
||||
def home():
|
||||
return render_template_string(HTML_TEMPLATE)
|
||||
|
||||
@app.route('/weather', methods=['GET', 'POST'])
|
||||
|
||||
@app.route("/weather", methods=["GET", "POST"])
|
||||
def weather():
|
||||
if request.method == 'POST':
|
||||
city = request.form.get('city')
|
||||
if request.method == "POST":
|
||||
city = request.form.get("city")
|
||||
else:
|
||||
city = request.args.get('city')
|
||||
city = request.args.get("city")
|
||||
|
||||
if not city:
|
||||
return jsonify({'error': 'City parameter is required'}), 400
|
||||
return jsonify({"error": "City parameter is required"}), 400
|
||||
|
||||
weather_data = get_weather(city)
|
||||
if weather_data:
|
||||
return jsonify(weather_data)
|
||||
else:
|
||||
return jsonify({'error': 'City not found or API request failed'}), 404
|
||||
return jsonify({"error": "City not found or API request failed"}), 404
|
||||
|
||||
@app.route('/health')
|
||||
|
||||
@app.route("/health")
|
||||
def health():
|
||||
return jsonify({'status': 'healthy', 'timestamp': datetime.now().isoformat()})
|
||||
return jsonify({"status": "healthy", "timestamp": datetime.now().isoformat()})
|
||||
|
||||
if __name__ == '__main__':
|
||||
app.run(host='0.0.0.0', port=5000, debug=False)
|
||||
|
||||
if __name__ == "__main__":
|
||||
app.run(host="0.0.0.0", port=5000, debug=False)
|
||||
|
||||
المرجع في مشكلة جديدة
حظر مستخدم