minhhungg commited on
Commit
7d7b830
·
1 Parent(s): 7e8bc99
Files changed (1) hide show
  1. agents.py +6 -12
agents.py CHANGED
@@ -5,7 +5,7 @@ import json
5
 
6
  logger = logging.getLogger(__name__)
7
 
8
- # Try to import Google AI packages with fallback options
9
  try:
10
  import google.generativeai as genai
11
  GENAI_PACKAGE = "generativeai"
@@ -14,7 +14,7 @@ except ImportError:
14
  import google.genai as genai
15
  GENAI_PACKAGE = "genai"
16
  except ImportError:
17
- logger.error("Failed to import Google AI package. Please install required dependencies.")
18
  raise
19
 
20
  from openai import OpenAI
@@ -29,13 +29,11 @@ class BaseAgent:
29
 
30
  # Version-specific configuration
31
  try:
32
- if HAS_GENERATIVEAI:
33
  genai.configure(api_key=api_key)
34
- elif HAS_GENAI:
35
- # For google.genai package
36
  os.environ["GOOGLE_API_KEY"] = api_key
37
- # Initialize model directly if needed
38
- self.genai_client = genai.GenerativeModel
39
  except Exception as e:
40
  logger.warning(f"Using fallback configuration method: {str(e)}")
41
  os.environ["GOOGLE_API_KEY"] = api_key
@@ -50,11 +48,7 @@ class BaseAgent:
50
 
51
  def _generate_with_gemini(self, prompt: str, system_prompt: str) -> str:
52
  try:
53
- if HAS_GENERATIVEAI:
54
- model = genai.GenerativeModel(model_name=self.gemini_model)
55
- else:
56
- model = self.genai_client(model_name=self.gemini_model)
57
-
58
  combined_prompt = f"System: {system_prompt}\n\nUser: {prompt}"
59
 
60
  try:
 
5
 
6
  logger = logging.getLogger(__name__)
7
 
8
+ # Try both import methods
9
  try:
10
  import google.generativeai as genai
11
  GENAI_PACKAGE = "generativeai"
 
14
  import google.genai as genai
15
  GENAI_PACKAGE = "genai"
16
  except ImportError:
17
+ logger.error("Failed to import Google AI package")
18
  raise
19
 
20
  from openai import OpenAI
 
29
 
30
  # Version-specific configuration
31
  try:
32
+ if GENAI_PACKAGE == "generativeai":
33
  genai.configure(api_key=api_key)
34
+ else:
 
35
  os.environ["GOOGLE_API_KEY"] = api_key
36
+
 
37
  except Exception as e:
38
  logger.warning(f"Using fallback configuration method: {str(e)}")
39
  os.environ["GOOGLE_API_KEY"] = api_key
 
48
 
49
  def _generate_with_gemini(self, prompt: str, system_prompt: str) -> str:
50
  try:
51
+ model = genai.GenerativeModel(model_name=self.gemini_model)
 
 
 
 
52
  combined_prompt = f"System: {system_prompt}\n\nUser: {prompt}"
53
 
54
  try: