Merge pull request #1 from aabmass/genaisdk_instrumentation-pythonpathfix

Remove the need for changing pythonpath with pytest

Author: michaelsafyan

instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/__init__.py

@@ -16,7 +16,7 @@
 import os
 import unittest
 
-from common.base import TestCase
+from ..common.base import TestCase
 
 
 def create_valid_response(

instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/generate_content/__init__.py

@@ -20,7 +20,7 @@
 import logging
 import unittest
 
-from common.base import TestCase
+from ..common.base import TestCase
 
 
 def create_valid_response(
@@ -67,7 +67,7 @@ def configure_valid_response(
 
     def generate_content(self, *args, **kwargs):
         return asyncio.run(
-            self.client.aio.models.generate_content(*args, **kwargs)
+            self.client.aio.models.generate_content(*args, **kwargs)  # pylint: disable=missing-kwoa
         )
 
     def test_async_generate_content_not_broken_by_instrumentation(self):

instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/generate_content/nonstreaming_base.py

@@ -22,7 +22,7 @@
 import logging
 import unittest
 
-from common.base import TestCase
+from ..common.base import TestCase
 
 
 def create_valid_response(
@@ -71,7 +71,7 @@ async def _generate_content_helper(self, *args, **kwargs):
         result = []
         async for (
             response
-        ) in await self.client.aio.models.generate_content_stream(
+        ) in await self.client.aio.models.generate_content_stream(  # pylint: disable=missing-kwoa
             *args, **kwargs
         ):
             result.append(response)

instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/generate_content/test_async_nonstreaming.py

@@ -15,7 +15,7 @@
 import logging
 import unittest
 
-from nonstreaming_base import NonStreamingTestCase
+from .nonstreaming_base import NonStreamingTestCase
 
 
 class TestGenerateContentSyncNonstreaming(NonStreamingTestCase):

instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/generate_content/test_async_streaming.py

@@ -19,7 +19,7 @@
 import logging
 import unittest
 
-from common.base import TestCase
+from ..common.base import TestCase
 
 
 def create_valid_response(
@@ -66,7 +66,7 @@ def configure_valid_response(
 
     def generate_content(self, *args, **kwargs):
         result = []
-        for response in self.client.models.generate_content_stream(
+        for response in self.client.models.generate_content_stream(  # pylint: disable=missing-kwoa
             *args, **kwargs
         ):
             result.append(response)

instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/generate_content/test_sync_nonstreaming.py

@@ -820,7 +820,7 @@ commands =
   test-instrumentation-vertexai: pytest {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-vertexai/tests --vcr-record=none {posargs}
   lint-instrumentation-vertexai: sh -c "cd instrumentation-genai && pylint --rcfile ../.pylintrc opentelemetry-instrumentation-vertexai"
 
-  test-instrumentation-google-genai: pytest {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-google-genai/tests -o pythonpath={toxinidir}/instrumentation-genai/opentelemetry-instrumentation-google-genai/tests --vcr-record=none {posargs}
+  test-instrumentation-google-genai: pytest {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-google-genai/tests --vcr-record=none {posargs}
   lint-instrumentation-google-genai: sh -c "cd instrumentation-genai && pylint --rcfile ../.pylintrc opentelemetry-instrumentation-google-genai"
 
   test-instrumentation-sio-pika: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/tests {posargs}