Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix (#1598): use config with NATS PullSub #1599

Merged
merged 2 commits into from
Jul 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions faststream/confluent/security.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ def parse_security(security: Optional[BaseSecurity]) -> "AnyDict":

if security is None:
return {}
elif type(security) == BaseSecurity:
return _parse_base_security(security)
elif type(security) == SASLPlaintext:
elif isinstance(security, SASLPlaintext):
return _parse_sasl_plaintext(security)
elif type(security) == SASLScram256:
elif isinstance(security, SASLScram256):
return _parse_sasl_scram256(security)
elif type(security) == SASLScram512:
elif isinstance(security, SASLScram512):
return _parse_sasl_scram512(security)
elif isinstance(security, BaseSecurity):
return _parse_base_security(security)
else:
raise NotImplementedError(f"KafkaBroker does not support `{type(security)}`.")

Expand Down
10 changes: 5 additions & 5 deletions faststream/kafka/security.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
def parse_security(security: Optional[BaseSecurity]) -> "AnyDict":
if security is None:
return {}
elif type(security) == BaseSecurity:
return _parse_base_security(security)
elif type(security) == SASLPlaintext:
elif isinstance(security, SASLPlaintext):
return _parse_sasl_plaintext(security)
elif type(security) == SASLScram256:
elif isinstance(security, SASLScram256):
return _parse_sasl_scram256(security)
elif type(security) == SASLScram512:
elif isinstance(security, SASLScram512):
return _parse_sasl_scram512(security)
elif isinstance(security, BaseSecurity):
return _parse_base_security(security)
else:
raise NotImplementedError(f"KafkaBroker does not support `{type(security)}`.")

Expand Down
3 changes: 3 additions & 0 deletions faststream/nats/subscriber/usecase.py
Original file line number Diff line number Diff line change
Expand Up @@ -700,6 +700,7 @@ async def _create_subscription( # type: ignore[override]
"""Create NATS subscription and start consume task."""
self.subscription = await connection.pull_subscribe(
subject=self.clear_subject,
config=self.config,
**self.extra_options,
)
self.add_task(self._consume_pull(cb=self.consume))
Expand Down Expand Up @@ -778,6 +779,7 @@ async def _create_subscription( # type: ignore[override]

self.subscription = await connection.pull_subscribe(
subject=self.clear_subject,
config=self.config,
**self.extra_options,
)
self.add_task(self._consume_pull(cb=self._put_msg))
Expand Down Expand Up @@ -841,6 +843,7 @@ async def _create_subscription( # type: ignore[override]
"""Create NATS subscription and start consume task."""
self.subscription = await connection.pull_subscribe(
subject=self.clear_subject,
config=self.config,
**self.extra_options,
)
self.add_task(self._consume_pull())
Expand Down
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ otel = ["opentelemetry-sdk>=1.24.0,<2.0.0"]
optionals = ["faststream[rabbit,kafka,confluent,nats,redis,otel]"]

devdocs = [
"mkdocs-material==9.5.27",
"mkdocs-material==9.5.29",
"mkdocs-static-i18n==1.2.3",
"mdx-include==1.4.2",
"mkdocstrings[python]==0.25.1",
Expand Down Expand Up @@ -111,14 +111,14 @@ types = [

lint = [
"faststream[types]",
"ruff==0.5.1",
"ruff==0.5.2",
"bandit==1.7.9",
"semgrep==1.79.0",
"codespell==2.3.0",
]

test-core = [
"coverage[toml]==7.5.4",
"coverage[toml]==7.6.0",
"pytest==8.2.2",
"pytest-asyncio==0.23.7",
"dirty-equals==0.7.1.post0",
Expand All @@ -127,7 +127,7 @@ test-core = [

testing = [
"faststream[test-core]",
"fastapi==0.111.0",
"fastapi==0.111.1",
"pydantic-settings>=2.0.0,<3.0.0",
"httpx==0.27.0",
"PyYAML==6.0.1",
Expand Down
Loading