conflict

Signed-off-by: skzhang1 <shaokunzhang529@gmail.com>

Author: skzhang1

openhands/nvidia/reward.py

@@ -4,10 +4,7 @@
 import os
 import random
 import threading
-<<<<<<< HEAD
-=======
 from typing import cast
->>>>>>> f7aaf55d (License & Readme & remove front & CICD etc.)
 
 import aiohttp
 from openai import AsyncOpenAI
@@ -131,13 +128,8 @@ async def get_reward(self, instance, solution_str, session=None):
                             'task': task,
                         },
                     ) as response:
-<<<<<<< HEAD
-                        response_json = await response.json()
-                        res = response_json['score']
-=======
                         result = await response.json()
                         res = result['score']
->>>>>>> f7aaf55d (License & Readme & remove front & CICD etc.)
                 except Exception as e:
                     logger.error(f'Error: {e}, ip: {ip}')
                     logger.info(
@@ -156,13 +148,8 @@ async def get_reward(self, instance, solution_str, session=None):
                             'data_source': data_source,
                         },
                     ) as response:
-<<<<<<< HEAD
-                        response_json = await response.json()
-                        res = response_json['score']
-=======
                         result = await response.json()
                         res = result['score']
->>>>>>> f7aaf55d (License & Readme & remove front & CICD etc.)
                 except Exception as e:
                     logger.error(f'Error: {e}, ip: {ip}')
                     logger.info(
@@ -177,14 +164,6 @@ async def get_reward(self, instance, solution_str, session=None):
 
         # TODO: add llm_as_judge reward
 
-<<<<<<< HEAD
-        # Convert res to float score
-        if isinstance(res, (int, float, bool)):
-            score = float(res)
-        else:
-            raise ValueError(f'Invalid reward type: {type(res)}')
-=======
         score = float(res)
->>>>>>> f7aaf55d (License & Readme & remove front & CICD etc.)
 
-        return {'resolved': score > 0.99, 'reward': score}
+        return {'resolved': score > 0.99, 'reward': score}