ccflow-email 0.2.0__tar.gz → 0.2.2__tar.gz

{ccflow_email-0.2.0 → ccflow_email-0.2.2}/.gitignore

@@ -5,12 +5,22 @@ __pycache__/
 
 # C extensions
 *.a
+*.o
+*.dSYM
 *.so
 *.obj
 *.dll
 *.exp
 *.lib
 
+# vcpkg
+vcpkg/
+vcpkg_installed/
+
+# Rust
+target
+target-capi
+
 # Distribution / packaging
 .Python
 build/
@@ -55,26 +65,12 @@ junit.xml
 .hypothesis/
 .pytest_cache/
 
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
+# Django
 *.log
 local_settings.py
 db.sqlite3
 db.sqlite3-journal
 
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# PyBuilder
-target/
-
 # IPython
 profile_default/
 ipython_config.py
@@ -85,15 +81,12 @@ ipython_config.py
 # pipenv
 Pipfile.lock
 
-# PEP 582; used by e.g. github.com/David-OConnor/pyflow
-__pypackages__/
-
-# Celery stuff
+# Celery
 celerybeat-schedule
 celerybeat.pid
 
-# SageMath parsed files
-*.sage.py
+# Airspeed Velocity
+.asv
 
 # Environments
 .env
@@ -126,11 +119,12 @@ dmypy.json
 /site
 index.md
 docs/_build/
-docs/src/_build/
 docs/api
-docs/index.md
 docs/html
+docs/index.md
 docs/jupyter_execute
+docs/src/_build/
+docs/superpowers
 index.md
 
 # JS
@@ -141,19 +135,28 @@ js/node_modules
 js/test-results
 js/playwright-report
 js/*.tgz
-ccflow_email/extension
 
 # Jupyter
 .ipynb_checkpoints
 .autoversion
 Untitled*.ipynb
-!ccflow_email/extension/ccflow_email.json
-!ccflow_email/extension/install.json
+ccflow_email/extension
 ccflow_email/nbextension
 ccflow_email/labextension
 
+# Emscripten SDK (locally installed)
+emsdk
+.pyodide_build/
+
 # Mac
 .DS_Store
 
-# Rust
-target
+# Hydra
+/outputs/
+/multirun/
+
+# AI
+ROADMAP.md
+AGENTS.md
+.github/hooks/sdlc.json
+.superpowers

{ccflow_email-0.2.0 → ccflow_email-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: ccflow-email
-Version: 0.2.0
+Version: 0.2.2
 Summary: ccflow models for email
 Project-URL: Repository, https://github.com/1kbgz/ccflow-email
 Project-URL: Homepage, https://github.com/1kbgz/ccflow-email
@@ -10,28 +10,29 @@ License-File: LICENSE
 Classifier: Development Status :: 3 - Alpha
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Requires-Dist: ccflow
 Requires-Dist: emails
 Provides-Extra: develop
 Requires-Dist: build; extra == 'develop'
 Requires-Dist: bump-my-version; extra == 'develop'
-Requires-Dist: check-manifest; extra == 'develop'
-Requires-Dist: codespell<2.5,>=2.4; extra == 'develop'
+Requires-Dist: check-dist; extra == 'develop'
+Requires-Dist: codespell; extra == 'develop'
 Requires-Dist: hatchling; extra == 'develop'
+Requires-Dist: mdformat; extra == 'develop'
+Requires-Dist: mdformat-myst; extra == 'develop'
 Requires-Dist: mdformat-tables>=1; extra == 'develop'
-Requires-Dist: mdformat<1.1,>=0.7.22; extra == 'develop'
 Requires-Dist: pytest; extra == 'develop'
 Requires-Dist: pytest-cov; extra == 'develop'
-Requires-Dist: ruff<0.15,>=0.9; extra == 'develop'
+Requires-Dist: ruff; extra == 'develop'
 Requires-Dist: twine; extra == 'develop'
+Requires-Dist: ty; extra == 'develop'
 Requires-Dist: uv; extra == 'develop'
 Requires-Dist: wheel; extra == 'develop'
 Description-Content-Type: text/markdown

{ccflow_email-0.2.0 → ccflow_email-0.2.2}/ccflow_email/__init__.py

@@ -1,4 +1,4 @@
 from .model import *
 from .publisher import *
 
-__version__ = "0.2.0"
+__version__ = "0.2.2"

{ccflow_email-0.2.0 → ccflow_email-0.2.2}/ccflow_email/model.py

@@ -1,25 +1,24 @@
-from typing import Union
-
 from ccflow import BaseModel
 from pydantic import Field, field_validator, model_validator
 
 __all__ = (
-    "Message",
     "SMTP",
     "Attachment",
     "Email",
+    "Message",
 )
 
 
 class Message(BaseModel):
-    content: str = Field(default=None, description="HTML content of the email")
-    subject: str = Field(default=None, description="Subject of the email")
-    from_: Union[tuple[str, str], str] = Field(default=None, description="Sender email address")
-    to_: Union[tuple[str, str], str] = Field(default=None, description="Recipient email address")
-    cc: Union[tuple[str, str], str, None] = Field(default=None, description="CC email address")
-    bcc: Union[tuple[str, str], str, None] = Field(default=None, description="BCC email address")
+    content: str | None = Field(default=None, description="HTML content of the email")
+    subject: str | None = Field(default=None, description="Subject of the email")
+    from_: tuple[str, str] | str | None = Field(default=None, description="Sender email address")
+    to_: tuple[str, str] | str | None = Field(default=None, description="Recipient email address")
+    cc: tuple[str, str] | str | None = Field(default=None, description="CC email address")
+    bcc: tuple[str, str] | str | None = Field(default=None, description="BCC email address")
 
     @field_validator("from_")
+    @classmethod
     def _validate_from(cls, v):
         # If tuple, must be (name, email)
         if isinstance(v, tuple):
@@ -30,6 +29,7 @@ class Message(BaseModel):
         return v
 
     @field_validator("to_")
+    @classmethod
     def _validate_to(cls, v):
         # If tuple, must be (name, email)
         if isinstance(v, tuple):
@@ -40,6 +40,7 @@ class Message(BaseModel):
         return v
 
     @field_validator("cc")
+    @classmethod
     def _validate_cc(cls, v):
         # If tuple, must be (name, email)
         if isinstance(v, tuple):
@@ -50,6 +51,7 @@ class Message(BaseModel):
         return v
 
     @field_validator("bcc")
+    @classmethod
     def _validate_bcc(cls, v):
         # If tuple, must be (name, email)
         if isinstance(v, tuple):
@@ -62,33 +64,12 @@ class Message(BaseModel):
 
 class SMTP(BaseModel):
     host: str = Field(..., description="SMTP server host")
-    port: int = Field(default=25, description="SMTP server port")
-    user: str = Field(default=None, description="SMTP server username")
-    password: str = Field(default=None, description="SMTP server password")
-    tls: bool = Field(default=False, description="Use TLS for SMTP connection")
-    ssl: bool = Field(default=False, description="Use SSL for SMTP connection")
-    timeout: int = Field(default=30, description="Timeout for SMTP connection in seconds")
-
-    @field_validator("port")
-    def validate_port(cls, v):
-        # Must be a normal smtp port
-        if v not in [25, 465, 587]:
-            raise ValueError("Invalid SMTP port")
-        return v
-
-    @field_validator("tls")
-    def validate_tls(cls, v, info):
-        # If port is 465, tls must be False
-        if info.data.get("port") == 465 and v:
-            raise ValueError("TLS cannot be True when port is 465")
-        return v
-
-    @field_validator("ssl")
-    def validate_ssl(cls, v, info):
-        # If port is 587 or 25, ssl must be False
-        if info.data.get("port") in [25, 587] and v:
-            raise ValueError("SSL cannot be True when port is 25 or 587")
-        return v
+    port: int | None = Field(default=25, description="SMTP server port")
+    user: str | None = Field(default=None, description="SMTP server username")
+    password: str | None = Field(default=None, repr=False, description="SMTP server password")
+    tls: bool | None = Field(default=False, description="Use TLS for SMTP connection")
+    ssl: bool | None = Field(default=False, description="Use SSL for SMTP connection")
+    timeout: int | None = Field(default=30, description="Timeout for SMTP connection in seconds")
 
 
 class Attachment(BaseModel):
@@ -100,7 +81,7 @@ class Attachment(BaseModel):
 class Email(BaseModel):
     message: Message = Field(description="Email message details")
     smtp: SMTP = Field(description="SMTP server configuration")
-    attachments: list[Attachment] = Field(default_factory=list, description="List of email attachments")
+    attachments: list[Attachment] | None = Field(default_factory=list, description="List of email attachments")
 
     @model_validator(mode="after")
     def _validate_from(self):
@@ -112,7 +93,7 @@ class Email(BaseModel):
             self.smtp.user = self.message.from_[1] if isinstance(self.message.from_, tuple) else self.message.from_
         return self
 
-    def send(self, to: Union[str, list[str]] = None, render: dict = None):
+    def send(self, to: str | tuple[str | None, str] | list[str | tuple[str | None, str]] | None = None, render: dict | None = None):
         # NOTE: defer import
         from emails import Message as EmailMessage
 
@@ -132,10 +113,10 @@ class Email(BaseModel):
             bcc=self.message.bcc,
         )
 
-        for attachment in self.attachments:
+        for attachment in self.attachments or ():
             msg.attach(filename=attachment.filename, content_disposition=attachment.content_disposition, data=attachment.data)
 
-        smtp_config = self.smtp.model_dump(exclude_none=True, exclude=["type_"])
+        smtp_config = self.smtp.model_dump(exclude_unset=True, exclude_none=True, exclude={"type_"})
         smtp_config["fail_silently"] = False
         response = msg.send(to=to, render=render or {}, smtp=smtp_config)
         return response

{ccflow_email-0.2.0 → ccflow_email-0.2.2}/ccflow_email/tests/test_model.py

@@ -15,6 +15,7 @@ class TestEmail:
         )
         assert email.message.subject == "Test Email"
         assert email.smtp.host == "smtp.example.com"
+        assert email.attachments is not None
         assert email.attachments[0].filename == "test.txt"
 
     @pytest.mark.skipif(not environ.get("SMTP_HOST"), reason="SMTP server not configured")
@@ -73,3 +74,28 @@ class TestEmail:
 
         assert response.success is True
         assert response.status_text == b"Message received"
+
+    def test_send_without_attachments(self):
+        email = Email(
+            message=Message(content="Hello", subject="Test", from_="sender@example.com"),
+            smtp=SMTP(host="smtp.example.com"),
+            attachments=None,
+        )
+        recipient = ("Recipient", "recipient@example.com")
+        with patch("emails.Message") as message:
+            response = email.send(to=recipient)
+        message.assert_called_once_with(html="Hello", subject="Test", mail_from="sender@example.com", mail_to=recipient, cc=None, bcc=None)
+        message.return_value.attach.assert_not_called()
+        assert response is message.return_value.send.return_value
+        assert "type_" not in message.return_value.send.call_args.kwargs["smtp"]
+
+
+class TestSMTP:
+    def test_repr_omits_password(self):
+        smtp = SMTP(host="smtp.example.com", user="user", password="smtp-secret")
+        email = Email(message=Message(content="Hi", subject="Test", from_="user"), smtp=smtp)
+
+        for value in (smtp, email):
+            assert "smtp-secret" not in repr(value)
+            assert "smtp-secret" not in str(value)
+        assert "smtp.example.com" in repr(smtp)

{ccflow_email-0.2.0 → ccflow_email-0.2.2}/pyproject.toml

@@ -1,15 +1,19 @@
 [build-system]
-requires = ["hatchling"]
-build-backend="hatchling.build"
+requires = [
+    "hatchling",
+]
+build-backend = "hatchling.build"
 
 [project]
 name = "ccflow-email"
-authors = [{name = "1kbgz", email = "dev@1kbgz.com"}]
+authors = [
+    {name = "1kbgz", email = "dev@1kbgz.com"},
+]
 description = "ccflow models for email"
 readme = "README.md"
 license = { text = "Apache-2.0" }
-version = "0.2.0"
-requires-python = ">=3.10"
+version = "0.2.2"
+requires-python = ">=3.11"
 keywords = []
 
 classifiers = [
@@ -18,7 +22,6 @@ classifiers = [
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
@@ -34,15 +37,17 @@ dependencies = [
 develop = [
     "build",
     "bump-my-version",
-    "check-manifest",
-    "codespell>=2.4,<2.5",
+    "check-dist",
+    "codespell",
     "hatchling",
-    "mdformat>=0.7.22,<1.1",
+    "mdformat",
+    "mdformat-myst",
     "mdformat-tables>=1",
     "pytest",
     "pytest-cov",
-    "ruff>=0.9,<0.15",
+    "ruff",
     "twine",
+    "ty",
     "uv",
     "wheel",
 ]
@@ -54,7 +59,7 @@ Repository = "https://github.com/1kbgz/ccflow-email"
 Homepage = "https://github.com/1kbgz/ccflow-email"
 
 [tool.bumpversion]
-current_version = "0.2.0"
+current_version = "0.2.2"
 commit = true
 tag = true
 commit_args = "-s"
@@ -69,18 +74,12 @@ filename = "pyproject.toml"
 search = 'version = "{current_version}"'
 replace = 'version = "{new_version}"'
 
-[tool.check-manifest]
-ignore = [
-    ".copier-answers.yaml",
-    "Makefile",
-    "docs/**/*",
-]
-
 [tool.coverage.run]
 branch = true
 omit = [
-    "ccflow_email/tests/integration/",
+    "ccflow_email/tests/integration/*",
 ]
+
 [tool.coverage.report]
 exclude_also = [
     "raise NotImplementedError",
@@ -97,28 +96,48 @@ artifacts = []
 src = "/"
 
 [tool.hatch.build.targets.sdist]
-packages = ["ccflow_email"]
+packages = [
+    "ccflow_email",
+]
 
 [tool.hatch.build.targets.wheel]
-packages = ["ccflow_email"]
+packages = [
+    "ccflow_email",
+]
 
 [tool.hatch.build.targets.wheel.shared-data]
 
 [tool.pytest.ini_options]
-addopts = ["-vvv", "--junitxml=junit.xml"]
+addopts = [
+    "-vvv",
+    "--junitxml=junit.xml",
+]
 testpaths = "ccflow_email/tests"
 
 [tool.ruff]
 line-length = 150
 
 [tool.ruff.lint]
-extend-select = ["I"]
+extend-select = [
+    "I",
+]
 
 [tool.ruff.lint.isort]
 combine-as-imports = true
 default-section = "third-party"
-known-first-party = ["ccflow_email"]
-section-order = ["future", "standard-library", "third-party", "first-party", "local-folder"]
+known-first-party = [
+    "ccflow_email",
+]
+section-order = [
+    "future",
+    "standard-library",
+    "third-party",
+    "first-party",
+    "local-folder",
+]
 
 [tool.ruff.lint.per-file-ignores]
-"__init__.py" = ["F401", "F403"]
+"__init__.py" = [
+    "F401",
+    "F403",
+]