merge conflict fix

airtai · Sep 24, 2024 · 7d39128 · 7d39128
1 parent b926aaf
commit 7d39128
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 43 deletions.
diff --git a/faststream/app.py b/faststream/app.py
@@ -7,15 +7,14 @@
     Sequence,
     Tuple,
     TypeVar,
-    Union,
 )
 
 import anyio
 from typing_extensions import ParamSpec
 
 from faststream._internal._compat import ExceptionGroup
 from faststream._internal.application import Application
-from faststream._internal.basic_types import AnyDict, AnyHttpUrl, Lifespan, LoggerProto
+from faststream._internal.basic_types import Lifespan, LoggerProto
 from faststream._internal.broker.broker import BrokerUsecase
 from faststream._internal.cli.supervisors.utils import set_exit
 from faststream._internal.log import logger

diff --git a/faststream/asgi/app.py b/faststream/asgi/app.py
@@ -12,7 +12,6 @@
     Protocol,
     Sequence,
     Tuple,
-    Union,
 )
 
 import anyio
@@ -32,18 +31,12 @@
 
     from faststream._internal.basic_types import (
         AnyCallable,
-        AnyDict,
-        AnyHttpUrl,
         Lifespan,
         LoggerProto,
         SettingField,
     )
     from faststream._internal.broker.broker import BrokerUsecase
     from faststream.asgi.types import ASGIApp, Receive, Scope, Send
-    from faststream.specification.schema.contact import Contact, ContactDict
-    from faststream.specification.schema.docs import ExternalDocs, ExternalDocsDict
-    from faststream.specification.schema.license import License, LicenseDict
-    from faststream.specification.schema.tag import Tag, TagDict
 
     class UvicornServerProtocol(Protocol):
         should_exit: bool
@@ -129,15 +122,6 @@ def from_app(
             asyncapi_path=asyncapi_path,
             logger=app.logger,
             lifespan=None,
-            title=app.title,
-            version=app.version,
-            description=app.description,
-            terms_of_service=app.terms_of_service,
-            license=app.license,
-            contact=app.contact,
-            tags=app.specification_tags,
-            external_docs=app.external_docs,
-            identifier=app.identifier,
         )
         asgi_app.lifespan_context = app.lifespan_context
         asgi_app._on_startup_calling = app._on_startup_calling

diff --git a/faststream/specification/asyncapi/generate.py b/faststream/specification/asyncapi/generate.py