Update app.py

app.py

@@ -1,4 +1,4 @@
-import os, time, json, base64, requests, itertools
+import os, time, json, base64, requests
 from bs4 import BeautifulSoup
 from flask import Flask, request, jsonify, Response, stream_with_context
 from flask_cors import CORS
@@ -23,44 +23,27 @@ def scrape_startpage(query, n=10):
         results = []
         for c in soup.find_all('div', class_='result')[:n]:
             t = c.find('a', class_='result-title')
-            if not t:
-                continue
+            if not t: continue
             d = c.find('p', class_='result-description') or c.find('span', class_='result-description')
-            results.append({
-                'title': t.get_text(strip=True),
-                'url': t.get('href'),
-                'desc': d.get_text(strip=True) if d else ''
-            })
+            results.append({'title': t.get_text(strip=True), 'url': t.get('href'), 'desc': d.get_text(strip=True) if d else ''})
         return results
     except Exception:
         return []
 
 def get_weather_from_ip(ip_address):
     try:
-        ip_response = requests.get(f'https://ipinfo.io/{ip_address}/json')
-        ip_response.raise_for_status()
-        ip_data = ip_response.json()
-        if ip_data.get('error'):
-            return {'error': 'Invalid IP'}
-        loc = ip_data.get('loc', '')
-        if not loc:
-            return {'error': 'No location'}
+        ip_data = requests.get(f'https://ipinfo.io/{ip_address}/json').json()
+        loc = ip_data.get('loc')
+        if not loc: return {'error': 'No location'}
         lat, lon = loc.split(',')
-        city = ip_data.get('city', 'Unknown')
-        country = ip_data.get('country', '')
-        if country != 'US':
-            return {'error': 'US only'}
-        points = requests.get(f'https://api.weather.gov/points/{lat},{lon}').json()
-        forecast_url = points['properties']['forecast']
-        forecast = requests.get(forecast_url).json()
+        if ip_data.get('country') != 'US':
+            return {'error': 'Weather only available in US'}
+        forecast = requests.get(requests.get(f'https://api.weather.gov/points/{lat},{lon}').json()['properties']['forecast']).json()
         current = forecast['properties']['periods'][0]
         return {
             'ip': ip_address,
-            'location': {'city': city, 'country': country, 'latitude': lat, 'longitude': lon},
-            'weather': {
-                'temperature': current['temperature'], 'feels_like': None, 'humidity': None,
-                'description': current['detailedForecast'], 'icon': None
-            }
+            'location': {'city': ip_data.get('city', 'Unknown'), 'country': ip_data.get('country'), 'latitude': lat, 'longitude': lon},
+            'weather': {'temperature': current['temperature'], 'description': current['detailedForecast']}
         }
     except Exception as e:
         return {'error': str(e)}
@@ -68,19 +51,16 @@ def get_weather_from_ip(ip_address):
 @app.route('/search')
 def search():
     q = request.args.get('q')
-    if not q:
-        return jsonify({'error': 'Missing q'}), 400
+    if not q: return jsonify({'error': 'Missing query'}), 400
     n = request.args.get('n', default=10, type=int)
     return jsonify({'query': q, 'results': scrape_startpage(q, n)})
 
 @app.route('/weather')
 def weather():
     ip = request.args.get('ip')
-    if not ip:
-        return jsonify({'error': 'Missing ip'}), 400
+    if not ip: return jsonify({'error': 'Missing ip'}), 400
     data = get_weather_from_ip(ip)
-    if 'error' in data:
-        return jsonify(data), 400
+    if 'error' in data: return jsonify(data), 400
     return jsonify(data)
 
 @app.route('/')
@@ -88,19 +68,11 @@ def health():
     return jsonify({'status': 'running', 'message': 'GridLock search API'})
 
 def morsify_key():
-    b1 = "bnZhcGktd0"
-    b2 = "VIa0RZSnVpYU"
-    b3 = "FfVDktXNHVrU1E"
-    b4 = "2YzBfV085TjlCUFBIaDlGRnBpZW9PNlVLN"
-    b5 = "WliQ1NBZGl"
-    seq = [b1[::-1], b2[::2] + b3[1::2], b4[::-1], b5]
-    j = "".join(seq)
-    z = base64.b64encode(j.encode()).decode()
-    y = "".join(chr((ord(c) - i) % 126) for i, c in enumerate(z))
-    x = base64.b64decode(base64.b64encode(y.encode())).decode()
-    mix = "".join(chr(ord(a) ^ ord(b)) for a, b in zip(x, itertools.cycle("K3yMix")))
-    clean = base64.b64decode(base64.b64encode(mix.encode())).decode()
-    return "".join(reversed(clean))[40:]+clean[:40]
+    prefix = "nvapi-"
+    rest_enc = "zAPHnOBRkqd0ZogQ4h4lZh4c8lZ4LgOcOOlhLL"
+    shift = 8
+    decoded = ''.join(chr((ord(c)-shift) % 126) for c in rest_enc)
+    return prefix + decoded
 
 @app.route('/v1/chat/completions', methods=['POST'])
 def chat_completions():
@@ -125,8 +97,7 @@ def chat_completions():
         if stream:
             def generate():
                 for line in r.iter_lines():
-                    if line:
-                        yield f"data: {line.decode('utf-8')}\n\n"
+                    if line: yield f"data: {line.decode()}\n\n"
             return Response(stream_with_context(generate()), content_type='text/event-stream')
         else:
             return jsonify(r.json())