Merge pull request #529 from 3rd-Son/testrefactor

added skipifs and fixture for all tests requiring env

pkgs/swarmauri/tests/integration/agents/RagAgent_i9n_test.py

@@ -1,7 +1,7 @@
 import os
 import pytest
 
-from swarmauri.llms.concrete.GroqModel import GroqModel
+from swarmauri.llms.concrete.GroqModel import GroqModel as LLM
 from swarmauri.conversations.concrete.MaxSystemContextConversation import (
     MaxSystemContextConversation,
 )
@@ -11,10 +11,17 @@
 from swarmauri.agents.concrete.RagAgent import RagAgent
 
 
-@pytest.mark.integration
-def test_agent_exec():
+@pytest.fixture(scope="module")
+def groq_model():
     API_KEY = os.getenv("GROQ_API_KEY")
-    llm = GroqModel(api_key=API_KEY)
+    if not API_KEY:
+        pytest.skip("Skipping due to environment variable not set")
+    llm = LLM(api_key=API_KEY)
+    return llm
+
+
+@pytest.mark.integration
+def test_agent_exec(groq_model):
     system_context = SystemMessage(content="Your name is Jeff.")
     conversation = MaxSystemContextConversation(
         system_context=system_context, max_size=4
@@ -29,7 +36,7 @@ def test_agent_exec():
     vector_store.add_documents(documents)
 
     agent = RagAgent(
-        llm=llm,
+        llm=groq_model,
         conversation=conversation,
         system_context=system_context,
         vector_store=vector_store,

pkgs/swarmauri/tests/integration/llms/AI21StudioModel_i9n_test.py

@@ -8,14 +8,18 @@
 from swarmauri.messages.concrete.SystemMessage import SystemMessage
 
 
-@pytest.mark.skipif(
-    not os.getenv("AI21STUDIO_API_KEY"),
-    reason="Skipping due to environment variable not set",
-)
-@pytest.mark.acceptance
-def test_nonpreamble_system_context():
+@pytest.fixture(scope="module")
+def ai21studio_model():
     API_KEY = os.getenv("AI21STUDIO_API_KEY")
-    model = LLM(api_key=API_KEY)
+    if not API_KEY:
+        pytest.skip("Skipping due to environment variable not set")
+    llm = LLM(api_key=API_KEY)
+    return llm
+
+
+@pytest.mark.acceptance
+def test_nonpreamble_system_context(ai21studio_model):
+    model = ai21studio_model
     conversation = Conversation()
 
     # Say hi
@@ -41,14 +45,9 @@ def test_nonpreamble_system_context():
     assert "Jeff" in prediction
 
 
-@pytest.mark.skipif(
-    not os.getenv("AI21STUDIO_API_KEY"),
-    reason="Skipping due to environment variable not set",
-)
 @pytest.mark.acceptance
-def test_multiple_system_contexts():
-    API_KEY = os.getenv("AI21STUDIO_API_KEY")
-    model = LLM(api_key=API_KEY)
+def test_multiple_system_contexts(ai21studio_model):
+    model = ai21studio_model
     conversation = Conversation()
 
     system_context = 'You only respond with the following phrase, "Jeff"'

pkgs/swarmauri/tests/integration/llms/AnthropicModel_i9n_test.py

@@ -8,14 +8,18 @@
 from swarmauri.messages.concrete.SystemMessage import SystemMessage
 
 
-@pytest.mark.skipif(
-    not os.getenv("ANTHROPIC_API_KEY"),
-    reason="Skipping due to environment variable not set",
-)
-@pytest.mark.acceptance
-def test_nonpreamble_system_context():
+@pytest.fixture(scope="module")
+def anthropic_model():
     API_KEY = os.getenv("ANTHROPIC_API_KEY")
-    model = LLM(api_key=API_KEY)
+    if not API_KEY:
+        pytest.skip("Skipping due to environment variable not set")
+    llm = LLM(api_key=API_KEY)
+    return llm
+
+
+@pytest.mark.acceptance
+def test_nonpreamble_system_context(anthropic_model):
+    model = anthropic_model
     conversation = Conversation()
 
     # Say hi
@@ -41,14 +45,9 @@ def test_nonpreamble_system_context():
     assert "Jeff" in prediction
 
 
-@pytest.mark.skipif(
-    not os.getenv("ANTHROPIC_API_KEY"),
-    reason="Skipping due to environment variable not set",
-)
 @pytest.mark.acceptance
-def test_multiple_system_contexts():
-    API_KEY = os.getenv("ANTHROPIC_API_KEY")
-    model = LLM(api_key=API_KEY)
+def test_multiple_system_contexts(anthropic_model):
+    model = anthropic_model
     conversation = Conversation()
 
     system_context = 'You only respond with the following phrase, "Jeff"'

pkgs/swarmauri/tests/integration/llms/CohereModel_i9n_test.py

@@ -8,14 +8,18 @@
 from swarmauri.messages.concrete.SystemMessage import SystemMessage
 
 
-@pytest.mark.acceptance
-@pytest.mark.skipif(
-    not os.getenv("COHERE_API_KEY"),
-    reason="Skipping due to environment variable not set",
-)
-def test_nonpreamble_system_context():
+@pytest.fixture(scope="module")
+def cohere_model():
     API_KEY = os.getenv("COHERE_API_KEY")
-    model = LLM(api_key=API_KEY)
+    if not API_KEY:
+        pytest.skip("Skipping due to environment variable not set")
+    llm = LLM(api_key=API_KEY)
+    return llm
+
+
+@pytest.mark.acceptance
+def test_nonpreamble_system_context(cohere_model):
+    model = cohere_model
     conversation = Conversation()
 
     # Say hi
@@ -42,13 +46,8 @@ def test_nonpreamble_system_context():
 
 
 @pytest.mark.acceptance
-@pytest.mark.skipif(
-    not os.getenv("COHERE_API_KEY"),
-    reason="Skipping due to environment variable not set",
-)
-def test_multiple_system_contexts():
-    API_KEY = os.getenv("COHERE_API_KEY")
-    model = LLM(api_key=API_KEY)
+def test_multiple_system_contexts(cohere_model):
+    model = cohere_model
     conversation = Conversation()
 
     system_context = 'You only respond with the following phrase, "Jeff"'

pkgs/swarmauri/tests/integration/llms/DeepInfraModel_i9n_test.py

@@ -8,14 +8,18 @@
 from swarmauri.messages.concrete.SystemMessage import SystemMessage
 
 
-@pytest.mark.acceptance
-@pytest.mark.skipif(
-    not os.getenv("DEEPINFRA_API_KEY"),
-    reason="Skipping due to environment variable not set",
-)
-def test_nonpreamble_system_context():
+@pytest.fixture(scope="module")
+def deepinfra_model():
     API_KEY = os.getenv("DEEPINFRA_API_KEY")
-    model = LLM(api_key=API_KEY)
+    if not API_KEY:
+        pytest.skip("Skipping due to environment variable not set")
+    llm = LLM(api_key=API_KEY)
+    return llm
+
+
+@pytest.mark.acceptance
+def test_nonpreamble_system_context(deepinfra_model):
+    model = deepinfra_model
     conversation = Conversation()
 
     # Say hi
@@ -42,13 +46,8 @@ def test_nonpreamble_system_context():
 
 
 @pytest.mark.acceptance
-@pytest.mark.skipif(
-    not os.getenv("DEEPINFRA_API_KEY"),
-    reason="Skipping due to environment variable not set",
-)
-def test_multiple_system_contexts():
-    API_KEY = os.getenv("DEEPINFRA_API_KEY")
-    model = LLM(api_key=API_KEY)
+def test_multiple_system_contexts(deepinfra_model):
+    model = deepinfra_model
     conversation = Conversation()
 
     system_context = 'You only respond with the following phrase, "Jeff"'

pkgs/swarmauri/tests/integration/llms/DeepSeekModel_i9n_test.py

@@ -8,14 +8,18 @@
 from swarmauri.messages.concrete.SystemMessage import SystemMessage
 
 
-@pytest.mark.acceptance
-@pytest.mark.skipif(
-    not os.getenv("DEEPSEEK_API_KEY"),
-    reason="Skipping due to environment variable not set",
-)
-def test_nonpreamble_system_context():
+@pytest.fixture(scope="module")
+def deepseek_model():
     API_KEY = os.getenv("DEEPSEEK_API_KEY")
-    model = LLM(api_key=API_KEY)
+    if not API_KEY:
+        pytest.skip("Skipping due to environment variable not set")
+    llm = LLM(api_key=API_KEY)
+    return llm
+
+
+@pytest.mark.acceptance
+def test_nonpreamble_system_context(deepseek_model):
+    model = deepseek_model
     conversation = Conversation()
 
     # Say hi
@@ -42,13 +46,8 @@ def test_nonpreamble_system_context():
 
 
 @pytest.mark.acceptance
-@pytest.mark.skipif(
-    not os.getenv("DEEPSEEK_API_KEY"),
-    reason="Skipping due to environment variable not set",
-)
-def test_multiple_system_contexts():
-    API_KEY = os.getenv("DEEPSEEK_API_KEY")
-    model = LLM(api_key=API_KEY)
+def test_multiple_system_contexts(deepseek_model):
+    model = deepseek_model
     conversation = Conversation()
 
     system_context = 'You only respond with the following phrase, "Jeff"'

pkgs/swarmauri/tests/integration/llms/GeminiProModel_i9n_test.py

@@ -8,14 +8,18 @@
 from swarmauri.messages.concrete.SystemMessage import SystemMessage
 
 
-@pytest.mark.acceptance
-@pytest.mark.skipif(
-    not os.getenv("GEMINI_API_KEY"),
-    reason="Skipping due to environment variable not set",
-)
-def test_nonpreamble_system_context():
+@pytest.fixture(scope="module")
+def gemini_pro_model():
     API_KEY = os.getenv("GEMINI_API_KEY")
-    model = LLM(api_key=API_KEY)
+    if not API_KEY:
+        pytest.skip("Skipping due to environment variable not set")
+    llm = LLM(api_key=API_KEY)
+    return llm
+
+
+@pytest.mark.acceptance
+def test_nonpreamble_system_context(gemini_pro_model):
+    model = gemini_pro_model
     conversation = Conversation()
 
     # Say hi
@@ -42,13 +46,8 @@ def test_nonpreamble_system_context():
 
 
 @pytest.mark.acceptance
-@pytest.mark.skipif(
-    not os.getenv("GEMINI_API_KEY"),
-    reason="Skipping due to environment variable not set",
-)
-def test_multiple_system_contexts():
-    API_KEY = os.getenv("GEMINI_API_KEY")
-    model = LLM(api_key=API_KEY)
+def test_multiple_system_contexts(gemini_pro_model):
+    model = gemini_pro_model
     conversation = Conversation()
 
     system_context = 'You only respond with the following phrase, "Jeff"'

pkgs/swarmauri/tests/integration/llms/GroqModel_i9n_test.py

@@ -8,13 +8,18 @@
 from swarmauri.messages.concrete.SystemMessage import SystemMessage
 
 
-@pytest.mark.acceptance
-@pytest.mark.skipif(
-    not os.getenv("GROQ_API_KEY"), reason="Skipping due to environment variable not set"
-)
-def test_nonpreamble_system_context():
+@pytest.fixture(scope="module")
+def groq_model():
     API_KEY = os.getenv("GROQ_API_KEY")
-    model = LLM(api_key=API_KEY)
+    if not API_KEY:
+        pytest.skip("Skipping due to environment variable not set")
+    llm = LLM(api_key=API_KEY)
+    return llm
+
+
+@pytest.mark.acceptance
+def test_nonpreamble_system_context(groq_model):
+    model = groq_model
     conversation = Conversation()
 
     # Say hi
@@ -41,12 +46,8 @@ def test_nonpreamble_system_context():
 
 
 @pytest.mark.acceptance
-@pytest.mark.skipif(
-    not os.getenv("GROQ_API_KEY"), reason="Skipping due to environment variable not set"
-)
-def test_multiple_system_contexts():
-    API_KEY = os.getenv("GROQ_API_KEY")
-    model = LLM(api_key=API_KEY)
+def test_multiple_system_contexts(groq_model):
+    model = groq_model
     conversation = Conversation()
 
     system_context = 'You only respond with the following phrase, "Jeff"'

pkgs/swarmauri/tests/integration/llms/MistralModel_i9n_test.py

@@ -8,14 +8,18 @@
 from swarmauri.messages.concrete.SystemMessage import SystemMessage
 
 
-@pytest.mark.acceptance
-@pytest.mark.skipif(
-    not os.getenv("MISTRAL_API_KEY"),
-    reason="Skipping due to environment variable not set",
-)
-def test_nonpreamble_system_context():
+@pytest.fixture(scope="module")
+def mistral_model():
     API_KEY = os.getenv("MISTRAL_API_KEY")
-    model = LLM(api_key=API_KEY)
+    if not API_KEY:
+        pytest.skip("Skipping due to environment variable not set")
+    llm = LLM(api_key=API_KEY)
+    return llm
+
+
+@pytest.mark.acceptance
+def test_nonpreamble_system_context(mistral_model):
+    model = mistral_model
     conversation = Conversation()
 
     # Say hi
@@ -42,13 +46,8 @@ def test_nonpreamble_system_context():
 
 
 @pytest.mark.acceptance
-@pytest.mark.skipif(
-    not os.getenv("MISTRAL_API_KEY"),
-    reason="Skipping due to environment variable not set",
-)
-def test_multiple_system_contexts():
-    API_KEY = os.getenv("MISTRAL_API_KEY")
-    model = LLM(api_key=API_KEY)
+def test_multiple_system_contexts(mistral_model):
+    model = mistral_model
     conversation = Conversation()
 
     system_context = 'You only respond with the following phrase, "Jeff"'