Update app.py

app.py

@@ -2,12 +2,11 @@ from smolagents import CodeAgent, DuckDuckGoSearchTool, HfApiModel, load_tool, t
 import datetime
 import pytz
 import yaml
-from skyfield.api import load, Topos
+from skyfield.api import load, Topos, load_file
 from tools.final_answer import FinalAnswerTool
 from Gradio_UI import GradioUI
 
-# Define Zodiac signs and their boundaries
-
+# Define Zodiac signs and their boundaries (0° to 360° ecliptic longitude)
 ZODIAC_SIGNS = [
     ("Aries", 0, 30),
     ("Taurus", 30, 60),
@@ -23,7 +22,7 @@ ZODIAC_SIGNS = [
     ("Pisces", 330, 360),
 ]
 
-# Define Moon phases
+# Moon phase boundaries (0° to 360° phase angle)
 MOON_PHASES = [
     ("New Moon", 0, 45),
     ("Waxing Crescent", 45, 90),
@@ -38,76 +37,79 @@ MOON_PHASES = [
 @tool
 def get_moon_info(date_time: str) -> dict:
     """
+    Returns Moon's Zodiac position with degrees/minutes and phase for given date/time.
 
-    A tool that calculates the Moon's Zodiac sign and phase for a given date and time.
-    
     Args:
-        date_time: A string in ISO 8601 format (YYYY-MM-DDTHH:MM:SS), e.g., '2023-10-05T12:00:00'.
-    
+        date_time (str): ISO 8601 format (YYYY-MM-DDTHH:MM:SS)
+
     Returns:
-        A dictionary containing the Moon's Zodiac sign and phase.
+        dict: {"zodiac_position": "Leo 15°30'",
+               "moon_phase": "Waxing Gibbous"}
     """
-
     try:
-        # Parse input date and time
+        # Parse input time
         user_time = datetime.datetime.strptime(date_time, "%Y-%m-%dT%H:%M:%S")
         user_time = pytz.utc.localize(user_time)
 
         # Load astronomical data
-        planets = load('de421.bsp')  # Ensure this file is accessible
+        planets = load('de421.bsp')
         ts = load.timescale()
-
-        # Convert user time to Skyfield timescale
         t = ts.from_datetime(user_time)
 
-        # Get the geocentric position of the Moon
+        # Get celestial bodies
         earth = planets['earth']
         moon = planets['moon']
+        sun = planets['sun']
+
+        # Calculate geocentric ecliptic longitude
         astrometric = earth.at(t).observe(moon)
-        ra, dec, distance = astrometric.radec()
+        _, _, ecliptic_lon = astrometric.ecliptic_latlon()  # Use ecliptic longitude
+        lon_deg = ecliptic_lon.degrees % 360  # Normalize to 0-360°
 
-        # Convert RA to degrees
-        ra_in_degrees = ra._degrees
+        # Calculate phase angle
+        phase_angle = earth.at(t).observe(moon).apparent().phase_angle(sun).degrees
 
-        # Determine the Zodiac sign based on RA
+        # Determine Zodiac sign and position
         zodiac_sign = "Unknown"
+        position_degrees = 0
         for sign, start, end in ZODIAC_SIGNS:
-            if start <= ra_in_degrees < end:
-                zodiac_sign = f"{sign} ({start}° - {end}°)"
+            if start <= lon_deg < end:
+                zodiac_sign = sign
+                position_degrees = lon_deg - start
                 break
 
-        # Calculate the Moon's phase
-        moon_phase_angle = earth.at(t).observe(moon).apparent().phase_angle().degrees
+        # Convert to degrees/minutes
+        degrees = int(position_degrees)
+        minutes = int((position_degrees % 1) * 60)
+        position_str = f"{zodiac_sign} {degrees}°{minutes:02}'"
+
+        # Determine phase
         moon_phase = "Unknown"
         for phase, start, end in MOON_PHASES:
-            if start <= moon_phase_angle < end:
+            if start <= phase_angle < end:
                 moon_phase = phase
                 break
 
         return {
-            "zodiac_sign": zodiac_sign,
-            "moon_phase": moon_phase,
+            "zodiac_position": position_str,
+            "moon_phase": moon_phase
         }
 
     except Exception as e:
-        return {"error": f"Invalid input or calculation error: {str(e)}"}
+        return {"error": f"Error: {str(e)}"}
 
+# Existing timezone tool remains unchanged
 @tool
 def get_current_time_in_timezone(timezone: str) -> str:
-    """A tool that fetches the current local time in a specified timezone.
-    Args:
-        timezone: A string representing a valid timezone (e.g., 'America/New_York').
-    """
+    """Returns current local time in specified timezone"""
     try:
-        # Create timezone object
         tz = pytz.timezone(timezone)
-        # Get current time in that timezone
         local_time = datetime.datetime.now(tz).strftime("%Y-%m-%d %H:%M:%S")
-        return f"The current local time in {timezone} is: {local_time}"
+        return f"Local time in {timezone}: {local_time}"
     except Exception as e:
-        return f"Error fetching time for timezone '{timezone}': {str(e)}"
-
+        return f"Error: {str(e)}"
 
+# Model configuration as specified
 final_answer = FinalAnswerTool()
 model = HfApiModel(
     max_tokens=2096,
@@ -116,24 +118,19 @@ model = HfApiModel(
     custom_role_conversions=None,
 )
 
-
-# Import tool from Hub
+# Setup agent with updated tools
 image_generation_tool = load_tool("agents-course/text-to-image", trust_remote_code=True)
 
 with open("prompts.yaml", 'r') as stream:
     prompt_templates = yaml.safe_load(stream)
-    
+
 agent = CodeAgent(
     model=model,
-    tools=[final_answer, get_moon_info],  # Add the updated tool here
+    tools=[final_answer, get_moon_info, get_current_time_in_timezone, image_generation_tool],
     max_steps=6,
     verbosity_level=1,
-    grammar=None,
-    planning_interval=None,
-    name=None,
-    description=None,
     prompt_templates=prompt_templates
 )
 
-
-GradioUI(agent).launch()
+if __name__ == "__main__":
+    GradioUI(agent).launch()