Fix imports after main changes

Author: tammy-baylis-swi

instrumentation/opentelemetry-instrumentation-psycopg/src/opentelemetry/instrumentation/psycopg/__init__.py

@@ -140,7 +140,7 @@
 from __future__ import annotations
 
 import logging
-from typing import Any, Callable, Collection, TypeVar
+from typing import Any, Callable, Collection, Optional, TypeVar
 
 import psycopg  # pylint: disable=import-self
 from psycopg.sql import Composed  # pylint: disable=no-name-in-module
@@ -241,7 +241,7 @@ def _uninstrument(self, **kwargs: Any):
     @staticmethod
     def instrument_connection(
         connection: psycopg.Connection,
-        tracer_provider: typing.Optional[trace_api.TracerProvider] = None,
+        tracer_provider: Optional[trace_api.TracerProvider] = None,
         enable_commenter: bool = False,
         commenter_options: dict = None,
         enable_attribute_commenter: bool = False,
@@ -361,8 +361,8 @@ def get_statement(self, cursor: CursorT, args: list[Any]) -> str:
 
 def _new_cursor_factory(
     db_api: dbapi.DatabaseApiIntegration = None,
-    base_factory: pg_cursor = None,
-    tracer_provider: typing.Optional[trace_api.TracerProvider] = None,
+    base_factory: psycopg.Cursor = None,
+    tracer_provider: Optional[trace_api.TracerProvider] = None,
     enable_commenter: bool = False,
     commenter_options: dict = None,
     enable_attribute_commenter: bool = False,