Merge branch 'main' into chore/gh-outta-here

All-Hands-AI · Jan 21, 2025 · d18855a · d18855a
2 parents 523a91a + 8ae3648
commit d18855a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/openhands/server/listen_socket.py b/openhands/server/listen_socket.py
@@ -37,7 +37,11 @@ async def connect(connection_id: str, environ, auth):
         if not signed_token:
             logger.error('No github_auth cookie')
             raise ConnectionRefusedError('No github_auth cookie')
-        decoded = jwt.decode(signed_token, config.jwt_secret, algorithms=['HS256'])
+        if not config.jwt_secret:
+            raise RuntimeError('JWT secret not found')
+        decoded = jwt.decode(
+            signed_token, config.jwt_secret.get_secret_value(), algorithms=['HS256']
+        )
         user_id = decoded['github_user_id']
 
         logger.info(f'User {user_id} is connecting to conversation {conversation_id}')

diff --git a/openhands/utils/embeddings.py b/openhands/utils/embeddings.py
@@ -100,7 +100,9 @@ def get_embedding_model(strategy: str, llm_config: LLMConfig) -> 'BaseEmbedding'
             return AzureOpenAIEmbedding(
                 model='text-embedding-ada-002',
                 deployment_name=llm_config.embedding_deployment_name,
-                api_key=llm_config.api_key,
+                api_key=llm_config.api_key.get_secret_value()
+                if llm_config.api_key
+                else None,
                 azure_endpoint=llm_config.base_url,
                 api_version=llm_config.api_version,
             )