Update generate-cot.py

fix counting between hours

generate-cot.py

@@ -23,11 +23,13 @@ def get_closest_numbers(time_str):
         'min': get_position_info(minute_degrees)
     }
 
-def generate_time_description(clock_data):
+def generate_time_description(clock_data, should_use_12=True):
 
     clock_params = clock_data['clock_params']
     clock_coordinates = clock_data['clock_coordinates']
     time_str = clock_params['time']
+    if should_use_12 and time_str.startswith('00'):
+        time_str = '12' + time_str[2:]
     is_unreadable = clock_params.get('isUnreadable', False)
     hours_format = clock_params.get('hours_format', 'unknown')
     hours_to_generate = clock_params.get('hours_to_generate', [])
@@ -43,9 +45,10 @@ def generate_time_description(clock_data):
     decal_center = clock_coordinates.get('decal_center', [0, 0])
     bg_width = clock_params.get('bgWidth', 1)  
     bg_height = clock_params.get('bgHeight', 1)
+    hours_generated = clock_params.get('hours_to_generate')
 
     if is_unreadable:
-        if hours_format == 'line' and clock_params.get('should_tilt_hours', False) and not should_have_decal:
+        if hours_format == 'line':
             return random.choice([
                 "The clock is unreadable because the hour markers are lines and the clock is tilted, making it impossible to determine the 12 o'clock position without any landmarks on the clock.",
                 "Due to the tilted clock and line-shaped hour markers, it's impossible to identify the 12 o'clock position without any reference points, rendering the clock unreadable.",
@@ -53,7 +56,7 @@ def generate_time_description(clock_data):
                 "Without any landmarks and with line-shaped hour markers on a tilted clock, it's not possible to determine the 12 o'clock position, making the clock unreadable.",
                 "The combination of a tilted clock face and line-shaped hour markers makes it impossible to identify the 12 o'clock position, rendering the clock unreadable without additional reference points."
             ])
-        elif hours_format == 'none' and not should_have_decal:
+        elif hours_format == 'none':
             return random.choice([
                 "The clock is unreadable because there are no hour markers or decals to indicate the 12 o'clock position.",
                 "Without any hour markers or decals, it's impossible to determine the 12 o'clock position, making the clock unreadable.",
@@ -61,7 +64,7 @@ def generate_time_description(clock_data):
                 "Due to the lack of hour markers or decals, the clock is unreadable since the 12 o'clock position cannot be determined.",
                 "The clock's readability is compromised by the absence of hour markers or decals, making it impossible to locate the 12 o'clock position."
             ])
-        else:
+        else: #shouldn't get here, but in case we add more
             return random.choice([
                 "The clock is unreadable due to insufficient markers or orientation cues.",
                 "Lack of adequate markers or orientation references makes the clock unreadable.",
@@ -117,18 +120,35 @@ def generate_time_description(clock_data):
     real_closest_min = real_closest_res['min']
 
     # Hour hand closest
-    before_distance = distance(hour_marker_points[before_hour_marker], hour_hand_tip)
-    after_distance = distance(hour_marker_points[after_hour_marker], hour_hand_tip)
+    def find_closest_neighbors(arr, target):
+        
+        # Sort the array to make finding neighbors easier
+        sorted_arr = sorted(arr)
+        
+        # If target is smaller than all elements
+        if target < sorted_arr[0]:
+            return str(sorted_arr[-1]), str(sorted_arr[0])
+        
+        # If target is larger than all elements
+        if target > sorted_arr[-1]:
+            return str(sorted_arr[-1]), str(sorted_arr[0])
+        
+        # Find the right neighbor (first element larger than target)
+        right_idx = 0
+        while right_idx < len(sorted_arr) and sorted_arr[right_idx] < target:
+            right_idx += 1
+        
+        # The left neighbor is the element before the right neighbor
+        left_idx = right_idx - 1
+        
+        return str(sorted_arr[left_idx]), str(sorted_arr[right_idx])
+
+    if real_closest_hour['closest'] in hours_generated:
+        hour_hand_relation = f"{real_closest_hour['position']} the {format_point(hour_marker_points[str(real_closest_hour['closest'])], str(real_closest_hour['closest']))} o'clock marker"
 
-    if before_distance < after_distance:
-        hour_hand_relation = f"After the {format_point(hour_marker_points[before_hour_marker], before_hour_marker)} o'clock marker"
-        relevant_marker = before_hour_marker
     else:
-        hour_hand_relation = f"Before the {format_point(hour_marker_points[after_hour_marker], after_hour_marker)} o'clock marker"
-        relevant_marker = after_hour_marker
-    
-    if not before_hour_marker == real_closest_hour['closest']:
-        hour_hand_relation = f"Between the {format_point(hour_marker_points[before_hour_marker], before_hour_marker)} and {format_point(hour_marker_points[after_hour_marker], after_hour_marker)} o'clock markers, {real_closest_hour['position']} where {real_closest_hour['closest']} would be"
+        smaller, larger = find_closest_neighbors(hours_generated, real_closest_hour['closest'])
+        hour_hand_relation = f"between the {format_point(hour_marker_points[smaller], smaller)} and {format_point(hour_marker_points[larger], larger)} o'clock markers, {real_closest_hour['position']} where the {real_closest_hour['closest']} would be"
 
 
 
@@ -157,23 +177,17 @@ def generate_time_description(clock_data):
     #         minute_hand_relation = f"between the {format_point(tick_positions[str(before_minute_tick)], before_minute_tick // 6)} and {format_point(tick_positions[str(after_minute_tick)], after_minute_tick // 6)} minute marks"
 
 
-    minute_distances = {int(marker): distance(pos, minute_hand_tip) for marker, pos in hour_marker_points.items()}
-    closest_minute_marker = min(minute_distances, key=minute_distances.get)
-    before_minute_marker, after_minute_marker = get_adjacent_markers(list(hour_marker_points.keys()), str(closest_minute_marker))
+    # minute_distances = {int(marker): distance(pos, minute_hand_tip) for marker, pos in hour_marker_points.items()}
 
-    before_distance = distance(hour_marker_points[before_minute_marker], minute_hand_tip)
-    after_distance = distance(hour_marker_points[after_minute_marker], minute_hand_tip)
 
-    if before_distance < after_distance:
-        minute_hand_relation = f"just after the {format_point(hour_marker_points[before_minute_marker], before_minute_marker)} o'clock marker"
-        relevant_minute_marker = before_minute_marker
-    else:
-        minute_hand_relation = f"just before the {format_point(hour_marker_points[after_minute_marker], after_minute_marker)} o'clock marker"
-        relevant_minute_marker = after_minute_marker
 
-    # Occasionally mention between markers
-    if not before_hour_marker == real_closest_min['closest']:
-        minute_hand_relation = f"between the {format_point(hour_marker_points[before_minute_marker], before_minute_marker)} and {format_point(hour_marker_points[after_minute_marker], after_minute_marker)} o'clock markers,  {real_closest_min['position']} where {real_closest_min['closest']} would be"
+
+    if real_closest_min['closest'] in hours_generated:
+        minute_hand_relation = f"{real_closest_min['position']} the {format_point(hour_marker_points[str(real_closest_min['closest'])], str(real_closest_min['closest']))} o'clock marker"
+
+    else:
+        smaller, larger = find_closest_neighbors(hours_generated, real_closest_min['closest'])
+        minute_hand_relation = f"between the {format_point(hour_marker_points[smaller], smaller)} and {format_point(hour_marker_points[larger], larger)} o'clock markers, {real_closest_min['position']} where the {real_closest_min['closest']} would be"
 
     # Generate phrases based on the clock parameters
     hour_format_phrases = {
@@ -196,7 +210,6 @@ def generate_time_description(clock_data):
     # give a point the model can orient around, will always have 12, 6, or 3, but prefer 12 then 6
     decal_phrase = ""
     if hours_format in ['line', 'none'] and should_have_decal:
-        print('aaaaa')
         if '12' in hour_marker_points:
             decal_phrase = (
                 f"Using the decal on the clock's {decal_position}, we know where {format_point(hour_marker_points['12'], '12')} is on this clock and can orient around it."
@@ -214,13 +227,13 @@ def generate_time_description(clock_data):
 
     hour_hand_phrases = [
         f"The {format_point(hour_hand_tip, 'hour hand')} is {hour_hand_relation}.",
-        f"At position {format_point(hour_hand_tip, 'hour hand tip')}, the hour hand lies {hour_hand_relation}.",
-        f"The hour hand points {hour_hand_relation}, located at {format_point(hour_hand_tip, 'hour hand tip')}."
+        f"The clock's {format_point(hour_hand_tip, 'hour hand tip')} lies {hour_hand_relation}.",
+        f"The {format_point(hour_hand_tip, 'hour hand tip')} points {hour_hand_relation}."
     ]
     minute_hand_phrases = [
         f"The {format_point(minute_hand_tip, 'minute hand')} is {minute_hand_relation}.",
-        f"At position {format_point(minute_hand_tip, 'minute hand tip')}, the minute hand lies {minute_hand_relation}.",
-        f"The minute hand points {minute_hand_relation}, located at {format_point(minute_hand_tip, 'minute hand tip')}."
+        f"The {format_point(minute_hand_tip, 'minute hand')} lies {minute_hand_relation}.",
+        f"The {format_point(minute_hand_tip, 'minute hand tip')} points {minute_hand_relation}."
     ]
     angle_phrase = f"The angle between the hour and minute hands is approximately {angle:.2f} degrees."
     conclusion_phrases = [
@@ -229,12 +242,12 @@ def generate_time_description(clock_data):
         f"As a result, the time is {hour:02d}:{minute:02d}."
     ]
 
-    # Assemble the description
+    # ignore smaller ticks and second hand imo
     description = " ".join(filter(None, [
         hour_marker_phrase,
         hour_marker_count_phrase,
-        smaller_tick_phrase,
-        second_hand_phrase,
+        # smaller_tick_phrase,
+        # second_hand_phrase,
         decal_phrase,
         random.choice(hour_hand_phrases),
         random.choice(minute_hand_phrases),
@@ -245,79 +258,5 @@ def generate_time_description(clock_data):
     return description
 
 
-clock_data = {
-    "clock_params": {
-        "fontSize": 82,
-        "hour_marker_radius": 100,
-        "hours_to_generate": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
-        "should_tilt_hours": True,
-        "font": "Times New Roman",
-        "hours_format": "line",
-        "outer_border_color": [0, 0, 0],
-        "outer_border_width": 9,
-        "smaller_tick_frequency": 6,
-        "has_smaller_ticks": True,
-        "has_larger_ticks": False,
-        "time": "01:38:25",
-        "using_image_hands": True,
-        "has_second_hand": False,
-        "hour_hand_front_len": 55,
-        "hour_hand_back_len": 5.5,
-        "hour_hand_width": 45,
-        "minute_hand_front_len": 86,
-        "minute_hand_back_len": 7.166666666666667,
-        "minute_hand_width": 30,
-        "second_hand_front_len": 66,
-        "second_hand_back_len": 6.6,
-        "second_hand_width": 4,
-        "decal_image_index": 0,
-        "hr_image_index": 4,
-        "min_image_index": 4,
-        "decal_scale": 0.3077502934453228,
-        "should_have_decal": True,
-        "decal_position": "right",
-        "ticks_inside": True,
-        "ticks_are_dots": False,
-        "use_rounded_line_endings": True,
-        "rotationX": -54.67108931132457,
-        "rotationY": 32.946092388345136,
-        "rotationZ": 0,
-        "translationX": 0.7226896871641983,
-        "translationY": 0.32557091472462885,
-        "clockScale": 0.2944735397200734,
-        "is_square_clock": False,
-        "isUnreadable": False,
-        "background_image": "background-0.jpg",
-        "background_rotation": 0,
-        "invert_background": False,
-        "reverse_background": True,
-        "bgWidth": 1024,
-        "bgHeight": 696
-    },
-    "clock_coordinates": {
-        "hour_marker_points": {
-            # "1": [840.7229584915374, 388.8294035200205],
-            # "2": [864.708426987622, 405.3574644148344],
-            "3": [873.4877177788603, 427.9352154724463],
-            # "4": [864.708426987622, 450.51296653005824],
-            # "5": [840.7229584915374, 467.04102742487214],
-            "6": [807.9581992042145, 473.09071758767016],
-            # "7": [775.1934399168915, 467.04102742487214],
-            # "8": [751.2079714208069, 450.51296653005824],
-            "9": [742.4286806295686, 427.9352154724463],
-            # "10": [751.2079714208069, 405.3574644148344],
-            # "11": [775.1934399168915, 388.8294035200205],
-            "12": [807.9581992042145, 382.7797133572225]
-        },
-        "hand_tips": {
-            "hour": [846.4389307129645, 404.88473026091174],
-            "minute": [747.3718624157557, 462.3506187558278]
-        },
-        "tick_positions": {
-            # Tick positions data (omitted for brevity)
-        },
-        "decal_center": [849.3226328451655, 427.9352154724463]
-    }
-}
 
-print(generate_time_description(clock_data))
+