Update tools.py

tools.py

@@ -159,12 +159,11 @@ class check_room_availability(ToolBase):
     
     @classmethod
     def invoke(cls, input: Dict) -> str: 
-
-        instance = cls(**input)
-        room_type = instance.room_type
-        check_in_date = instance.check_in_date
-        check_out_date = instance.check_out_date
-        guests = instance.guests
+        
+        room_type = input.get("room_type", None)
+        check_in_date = input.get("check_in_date", None)
+        check_out_date = input.get("check_out_date", None)
+        guests = input.get("guests", None)
 
         missing = []
         if not room_type:
@@ -179,6 +178,12 @@ class check_room_availability(ToolBase):
         if len(missing):
             value = ", ".join(missing)
             return f"Unable to check the room availability. The following required arguments are missing:{value}." 
+
+        instance = cls(**input)
+        room_type = instance.room_type
+        check_in_date = instance.check_in_date
+        check_out_date = instance.check_out_date
+        guests = instance.guests
         
         rooms = [room for room in json_data["accomodations"] if room_type in room["type"]]
         if len(rooms) == 0:
@@ -203,15 +208,18 @@ class make_reservation(ToolBase):
     user_id: int = Field(description="The identifier for the user making the reservation.")
     
     @classmethod
-    def invoke(cls, input: Dict) -> str: 
+    def invoke(cls, input: Dict) -> str:
         
-        instance = cls(**input)
-        room_type = instance.room_type
-        check_in_date = instance.check_in_date
-        check_out_date = instance.check_out_date
-        guests = instance.guests
-        user_id = instance.user_id
-
+        room_type = input.get("room_type", None)
+        check_in_date = input.get("check_in_date", None)
+        check_out_date = input.get("check_out_date", None)
+        guests = input.get("guests", None)
+        user_id = input.get("user_id", None)
+        
+        if len(missing):
+            value = ", ".join(missing)
+            return f"Unable to complete the reservation. The following required arguments are missing:{value}."   
+    
         missing = []
         if not room_type:
             missing.append("room_type")
@@ -224,9 +232,12 @@ class make_reservation(ToolBase):
         if not user_id:
             missing.append("user_id")
 
-        if len(missing):
-            value = ", ".join(missing)
-            return f"Unable to complete the reservation. The following required arguments are missing:{value}."     
+        instance = cls(**input)
+        room_type = instance.room_type
+        check_in_date = instance.check_in_date
+        check_out_date = instance.check_out_date
+        guests = instance.guests
+        user_id = instance.user_id
 
         rooms = [room for room in json_data["accomodations"] if room_type in room["type"]]
         if len(rooms) == 0:
@@ -267,13 +278,9 @@ class cancel_reservation(ToolBase):
     
     @classmethod
     def invoke(cls, input: Dict) -> str: 
-        """
-        Play a playlist by its name, starting with the first or a random song.
-        """
 
-        instance = cls(**input)
-        reservation_id = instance.reservation_id
-        user_id = instance.user_id
+        reservation_id = input.get("reservation_id", None)
+        user_id = input.get("user_id", None)
 
         missing = []
         if not reservation_id:
@@ -284,6 +291,12 @@ class cancel_reservation(ToolBase):
         if len(missing):
             value = ", ".join(missing)
             return f"Unable to cancel the reservation. The following required arguments are missing:{value}."     
+        
+        instance = cls(**input)
+        reservation_id = instance.reservation_id
+        user_id = instance.user_id
+
+
 
         if reservation_id not in reservations:
             return f"There is no reservations with the id: {reservation_id}"
@@ -310,6 +323,15 @@ class modify_reservation(ToolBase):
 
     @classmethod
     def invoke(cls, input: Dict) -> str: 
+        
+        user_id = input.get("user_id", None)
+        reservation_id = input.get("reservation_id", None)
+
+        missing = []
+        if not reservation_id:
+            missing.append("reservation_id")
+        if not user_id:
+            missing.append("user_id")
 
         instance = cls(**input)
         new_room_type = instance.new_room_type
@@ -319,12 +341,6 @@ class modify_reservation(ToolBase):
         user_id = instance.user_id
         reservation_id = instance.reservation_id
 
-        missing = []
-        if not reservation_id:
-            missing.append("reservation_id")
-        if not user_id:
-            missing.append("user_id")
-
         if len(missing):
             value = ", ".join(missing)
             return f"Unable to modify the reservation. The following required arguments are missing:{value}."     
@@ -375,11 +391,9 @@ class get_reservation_details(ToolBase):
 
     @classmethod
     def invoke(cls, input: Dict) -> str: 
-
-        instance = cls(**input)
-        user_id = instance.user_id
-        reservation_id = instance.reservation_id
-
+        user_id = input.get("user_id", None)
+        reservation_id = input.get("reservation_id", None)
+    
         missing = []
         if not reservation_id:
             missing.append("reservation_id")
@@ -390,6 +404,10 @@ class get_reservation_details(ToolBase):
             value = ", ".join(missing)
             return f"Unable to get the details. The following required arguments are missing:{value}."     
 
+        instance = cls(**input)
+        user_id = instance.user_id
+        reservation_id = instance.reservation_id
+
         if reservation_id not in reservations:
             return f"There is no reservations with the id: {reservation_id}"