Update app.py

app.py

@@ -1,17 +1,83 @@
 import gradio as gr
 import folium
 from folium import plugins
+import requests
 import pandas as pd
 from datetime import datetime
 import time
 import numpy as np
 import plotly.graph_objects as go
 from plotly.subplots import make_subplots
-from opensky_api import OpenSkyApi  # OpenSky API 클래스 import
 
 # OpenSky API 인증 정보
 USERNAME = "seawolf2357"
 PASSWORD = "Time2175!@"
+
+class OpenSkyApi:
+    def __init__(self, username=None, password=None):
+        self.auth = (username, password) if username and password else None
+        self.base_url = "https://opensky-network.org/api"
+    
+    def get_states(self, time_secs=0, icao24=None, bbox=None):
+        """Retrieve state vectors for a given time."""
+        params = {"time": int(time_secs) if time_secs else int(time.time())}
+        
+        if icao24:
+            params["icao24"] = icao24
+        if bbox:
+            params.update({
+                "lamin": bbox[0],
+                "lamax": bbox[1],
+                "lomin": bbox[2],
+                "lomax": bbox[3]
+            })
+        
+        try:
+            response = requests.get(
+                f"{self.base_url}/states/all",
+                params=params,
+                auth=self.auth,
+                timeout=15
+            )
+            if response.status_code == 200:
+                return StateVector(response.json())
+            else:
+                print(f"Error {response.status_code}: {response.text}")
+                return None
+        except Exception as e:
+            print(f"Error fetching data: {e}")
+            return None
+
+class StateVector:
+    def __init__(self, states_json):
+        self.time = states_json.get('time', 0)
+        self.states = []
+        
+        if states_json.get('states'):
+            for state in states_json['states']:
+                self.states.append(State(state))
+
+class State:
+    def __init__(self, state_array):
+        self.icao24 = state_array[0]
+        self.callsign = state_array[1]
+        self.origin_country = state_array[2]
+        self.time_position = state_array[3]
+        self.last_contact = state_array[4]
+        self.longitude = state_array[5]
+        self.latitude = state_array[6]
+        self.geo_altitude = state_array[7]
+        self.on_ground = state_array[8]
+        self.velocity = state_array[9]
+        self.true_track = state_array[10]
+        self.vertical_rate = state_array[11]
+        self.sensors = state_array[12]
+        self.baro_altitude = state_array[13]
+        self.squawk = state_array[14]
+        self.spi = state_array[15]
+        self.position_source = state_array[16] if len(state_array) > 16 else None
+
+# OpenSky API 인스턴스 생성
 api = OpenSkyApi(USERNAME, PASSWORD)
 
 def get_states(bounds=None, max_retries=3):
@@ -19,25 +85,25 @@ def get_states(bounds=None, max_retries=3):
     for attempt in range(max_retries):
         try:
             if bounds:
-                # bbox = (min latitude, max latitude, min longitude, max longitude)
-                states = api.get_states(bbox=(
-                    bounds.get('lamin', None),
-                    bounds.get('lamax', None),
-                    bounds.get('lomin', None),
-                    bounds.get('lomax', None)
-                ))
+                bbox = (
+                    bounds['lamin'],
+                    bounds['lamax'],
+                    bounds['lomin'],
+                    bounds['lomax']
+                )
+                states = api.get_states(bbox=bbox)
             else:
                 states = api.get_states()
             
-            if states:
+            if states and states.states:
                 return {'states': states.states}
-            else:
-                if attempt < max_retries - 1:
-                    wait_time = min(2 ** attempt, 60)
-                    print(f"Retrying in {wait_time} seconds...")
-                    time.sleep(wait_time)
-                    continue
-                return None
+            
+            if attempt < max_retries - 1:
+                wait_time = min(2 ** attempt, 60)
+                print(f"Retrying in {wait_time} seconds...")
+                time.sleep(wait_time)
+                continue
+            return None
                 
         except Exception as e:
             print(f"Error fetching data: {e}")
@@ -47,6 +113,8 @@ def get_states(bounds=None, max_retries=3):
             return None
     return None
 
+
+
 def create_monitoring_dashboard(states):
     """Create monitoring dashboard using Plotly"""
     if not states: