Update app.py

app.py

@@ -6,160 +6,71 @@ import pandas as pd
 import plotly.express as px
 import plotly.graph_objects as go
 
+# Updated NASA API client with proper endpoints and data parsing
+import requests
+import pandas as pd
+
 class NasaSsdCneosApi:
-    """
-    A class to interact with NASA's SSD/CNEOS API.
-    Provides methods to access data on near-Earth objects, close approaches, and more.
-    """
-    
     def __init__(self):
-        self.base_url = "https://ssd-api.jpl.nasa.gov"
-        self.cneos_url = f"{self.base_url}/cneos"
-        self.fireball_url = f"{self.cneos_url}/fireballs"
-        self.ca_url = f"{self.cneos_url}/close_approaches"
-        self.nea_url = f"{self.cneos_url}/nea"
-        self.scout_url = f"{self.cneos_url}/scout"
-        
+        self.fireball_url = "https://ssd-api.jpl.nasa.gov/fireball.api"
+        self.ca_url = "https://ssd-api.jpl.nasa.gov/cad.api"
+
     def get_fireballs(self, limit=10, date_min=None, energy_min=None):
-        """Get information about recent fireballs"""
         params = {'limit': limit}
         if date_min:
             params['date-min'] = date_min
         if energy_min:
             params['energy-min'] = energy_min
-            
+
         response = requests.get(self.fireball_url, params=params)
         if response.status_code == 200:
             return response.json()
-        else:
-            print(f"Error: {response.status_code}")
-            return None
-    
-    def get_close_approaches(self, dist_max=None, date_min=None, date_max=None, 
-                            h_min=None, h_max=None, v_inf_min=None, v_inf_max=None, 
-                            limit=10):
-        """Get information about close approaches of near-Earth objects"""
-        
-        params = {'limit': limit}
-        if dist_max:
-            params['dist-max'] = dist_max
-        if date_min:
-            params['date-min'] = date_min
-        if date_max:
-            params['date-max'] = date_max
-        if h_min:
-            params['h-min'] = h_min
-        if h_max:
-            params['h-max'] = h_max
-        if v_inf_min:
-            params['v-inf-min'] = v_inf_min
-        if v_inf_max:
-            params['v-inf-max'] = v_inf_max
-            
+        return None
+
+    def get_close_approaches(self, dist_max=None, date_min=None, date_max=None,
+                              h_min=None, h_max=None, v_inf_min=None, v_inf_max=None,
+                              limit=10):
+        params = {'limit': limit, 'dist-max': dist_max, 'date-min': date_min,
+                  'date-max': date_max, 'h-min': h_min, 'h-max': h_max,
+                  'v-inf-min': v_inf_min, 'v-inf-max': v_inf_max, 'sort': 'date'}
+        # Remove None values
+        params = {k: v for k, v in params.items() if v is not None}
+
         response = requests.get(self.ca_url, params=params)
         if response.status_code == 200:
             return response.json()
-        else:
-            print(f"Error: {response.status_code}")
-            return None
-    
-    def get_nea_data(self, spk_id=None, des=None, h_max=None):
-        """Get data about specific near-Earth asteroids"""
-        params = {}
-        if spk_id:
-            params['spk-id'] = spk_id
-        if des:
-            params['des'] = des
-        if h_max:
-            params['h-max'] = h_max
-            
-        response = requests.get(self.nea_url, params=params)
-        if response.status_code == 200:
-            return response.json()
-        else:
-            print(f"Error: {response.status_code}")
-            return None
-    
-    def get_scout_data(self, nea_comet='NEA', limit=10):
-        """Get Scout system data for newly discovered objects"""
-        params = {'nea-comet': nea_comet, 'limit': limit}
-        
-        response = requests.get(self.scout_url, params=params)
-        if response.status_code == 200:
-            return response.json()
-        else:
-            print(f"Error: {response.status_code}")
-            return None
-            
+        return None
+
     def format_response(self, data, format_type):
-        """Format the response data for better readability"""
         if not data:
             return None
-        
+
+        fields = data.get('fields')
+        rows = data.get('data')
+
+        if not fields or not rows:
+            return None
+
+        df = pd.DataFrame([dict(zip(fields, row)) for row in rows])
+
         if format_type == 'fireballs':
-            result = []
-            for fireball in data.get('data', []):
-                entry = {
-                    'Date/Time': fireball.get('date'),
-                    'Energy (kt)': fireball.get('energy'),
-                    'Impact Energy (10^10 J)': fireball.get('impact-e'),
-                    'Latitude': fireball.get('lat'),
-                    'Longitude': fireball.get('lon'),
-                    'Altitude (km)': fireball.get('alt'),
-                    'Velocity (km/s)': fireball.get('vel')
-                }
-                result.append(entry)
-            return pd.DataFrame(result)
-        
+            return df.rename(columns={
+                'date': 'Date/Time', 'energy': 'Energy (kt)',
+                'impact-e': 'Impact Energy (10^10 J)', 'lat': 'Latitude',
+                'lon': 'Longitude', 'alt': 'Altitude (km)',
+                'vel': 'Velocity (km/s)'
+            })
+
         elif format_type == 'close_approaches':
-            result = []
-            for ca in data.get('data', []):
-                entry = {
-                    'Object': ca.get('des'),
-                    'Orbit ID': ca.get('orbit_id'),
-                    'Time (TDB)': ca.get('cd'),
-                    'Nominal Distance (au)': ca.get('dist'),
-                    'Minimum Distance (au)': ca.get('dist_min'),
-                    'Maximum Distance (au)': ca.get('dist_max'),
-                    'Velocity (km/s)': ca.get('v_rel'),
-                    'H (mag)': ca.get('h')
-                }
-                result.append(entry)
-            return pd.DataFrame(result)
-        
-        elif format_type == 'nea':
-            result = []
-            for nea in data.get('data', []):
-                entry = {
-                    'Designation': nea.get('des'),
-                    'H (mag)': nea.get('h'),
-                    'Diameter (km)': nea.get('diameter'),
-                    'Orbit Class': nea.get('orbit_class'),
-                    'Perihelion (au)': nea.get('q'),
-                    'Aphelion (au)': nea.get('ad'),
-                    'Inclination (deg)': nea.get('i'),
-                }
-                result.append(entry)
-            return pd.DataFrame(result)
-        
-        elif format_type == 'scout':
-            result = []
-            for obj in data.get('data', []):
-                entry = {
-                    'Object': obj.get('object'),
-                    'Rating': obj.get('rating'),
-                    'Last Observation': obj.get('last_obs'),
-                    'Arc (days)': obj.get('arc'),
-                    'Observations': obj.get('n_obs'),
-                    'H (mag)': obj.get('h'),
-                    'Diameter (m)': obj.get('diameter'),
-                    'Close Approach': obj.get('ca_dist_min'),
-                    'Velocity (km/s)': obj.get('v_inf')
-                }
-                result.append(entry)
-            return pd.DataFrame(result)
-        
-        return None
+            return df.rename(columns={
+                'des': 'Object', 'orbit_id': 'Orbit ID', 'cd': 'Time (TDB)',
+                'dist': 'Nominal Distance (au)', 'dist_min': 'Minimum Distance (au)',
+                'dist_max': 'Maximum Distance (au)', 'v_rel': 'Velocity (km/s)',
+                'h': 'H (mag)'
+            })
+
+        return df
+
 
 
 # Gradio Interface Functions