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

Add some useful mkdocs extensions #244

Merged
merged 9 commits into from
Dec 4, 2023
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
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

## Introduction

<!-- introduction -->

Frequenz Channels is a *channels* implementation for Python.

According to [Wikipedia](https://en.wikipedia.org/wiki/Channel_(programming)):
Expand All @@ -20,14 +22,20 @@ Frequenz Channels are mostly designed after [Go
channels](https://tour.golang.org/concurrency/2) but it also borrows ideas from
[Rust channels](https://doc.rust-lang.org/book/ch16-02-message-passing.html).

<!-- /introduction -->

## Supported Platforms

<!-- supported-platforms -->

The following platforms are officially supported (tested):

- **Python:** 3.11
- **Operating System:** Ubuntu Linux 20.04
- **Architectures:** amd64, arm64

<!-- /supported-platforms -->

## Quick Start

We assume you are on a system with Python available. If that is not the case,
Expand Down
39 changes: 39 additions & 0 deletions docs/_scripts/macros.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,11 @@
from typing import Any

import markdown as md
from griffe import Object
from griffe.collections import ModulesCollection
from markdown.extensions import toc
from mkdocs_macros import plugin as macros
from mkdocstrings_handlers.python.handler import PythonHandler

_CODE_ANNOTATION_MARKER: str = (
r'<span class="md-annotation">'
Expand Down Expand Up @@ -77,5 +80,41 @@ def define_env(env: macros.MacrosPlugin) -> None:
# https://squidfunk.github.io/mkdocs-material/reference/code-blocks/#adding-annotations
env.variables["code_annotation_marker"] = _CODE_ANNOTATION_MARKER

python_handler = env.conf["plugins"]["mkdocstrings"].get_handler("python")
assert isinstance(python_handler, PythonHandler)

def _get_docstring(symbol: str) -> str:
symbols = python_handler._modules_collection # pylint: disable=protected-access
assert isinstance(symbols, ModulesCollection)

try:
obj = symbols[symbol]
except KeyError as exc:
raise ValueError(f"Symbol {symbol!r} not found.") from exc
assert isinstance(obj, Object)

docstring = obj.docstring
if not docstring:
raise ValueError(f"Symbol {symbol!r} has no docstring.")

return docstring.value

# The decorator makes the function untyped
@env.macro # type: ignore[misc]
def docstring_summary(symbol: str) -> str:
"""Get the summary of a Python symbol.

Args:
symbol: The fully qualified name of the Python symbol to get the summary of.

Returns:
The summary of the Python symbol.
"""
docstring = _get_docstring(symbol)
summary = docstring.splitlines(keepends=False)[0]
return python_handler.do_convert_markdown(
summary, heading_level=1, strip_paragraph=True
)

# This hook needs to be done at the end of the `define_env` function.
_hook_macros_plugin(env)
24 changes: 12 additions & 12 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@

## Introduction

Frequenz Channels is a *channels* implementation for Python.
{%
include-markdown "../README.md"
start="<!-- introduction -->"
end="<!-- /introduction -->"
%}

According to [Wikipedia](https://en.wikipedia.org/wiki/Channel_(programming)):
## Supported Platforms

> A channel is a model for interprocess communication and synchronization via
> message passing. A message may be sent over a channel, and another process or
> thread is able to receive messages sent over a channel it has a reference to,
> as a stream. Different implementations of channels may be buffered or not,
> and either synchronous or asynchronous.

Frequenz Channels are mostly designed after [Go
channels](https://tour.golang.org/concurrency/2) but it also borrows ideas from
[Rust channels](https://doc.rust-lang.org/book/ch16-02-message-passing.html).
{%
include-markdown "../README.md"
start="<!-- supported-platforms -->"
end="<!-- /supported-platforms -->"
%}

## Installation

Expand Down Expand Up @@ -77,5 +77,5 @@ $ python3
Python 3.11.4 (main, Jun 7 2023, 10:13:09) [GCC 12.2.0] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> import frequenz.channels
>>>
>>>
```
7 changes: 6 additions & 1 deletion mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@ theme:
features:
- content.code.annotate
- content.code.copy
- navigation.expand
- navigation.footer
- navigation.indexes
- navigation.instant
- navigation.footer
- navigation.tabs
- navigation.top
- navigation.tracking
Expand Down Expand Up @@ -67,6 +68,8 @@ markdown_extensions:
- attr_list
- def_list
- footnotes
- markdown_svgbob:
min_char_width: 0
- pymdownx.details
- pymdownx.highlight:
anchor_linenums: true
Expand All @@ -90,6 +93,7 @@ plugins:
- gen-files:
scripts:
- docs/_scripts/mkdocstrings_autoapi.py
- include-markdown
- literate-nav:
nav_file: SUMMARY.md
- mike:
Expand Down Expand Up @@ -129,3 +133,4 @@ plugins:
watch:
- "src"
- CONTRIBUTING.md
- README.md
18 changes: 10 additions & 8 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,33 +45,35 @@ dev-flake8 = [
]
dev-formatting = ["black == 23.10.1", "isort == 5.12.0"]
dev-mkdocs = [
"Markdown == 3.5.1",
"black == 23.10.1",
"Markdown==3.5.1",
"frequenz-repo-config[lib] == 0.7.5",
"markdown-svgbob == 202112.1022",
"mike == 2.0.0",
"mkdocs-gen-files == 0.5.0",
"mkdocs-include-markdown-plugin == 6.0.4",
"mkdocs-literate-nav == 0.6.1",
"mkdocs-material == 9.4.7",
"mkdocs-macros-plugin == 1.0.5",
"mkdocs-material == 9.4.7",
"mkdocstrings[python] == 0.23.0",
"frequenz-repo-config[lib] == 0.7.5",
]
dev-mypy = [
"mypy == 1.6.1",
"types-Markdown == 3.5.0.0",
# For checking the noxfile, docs/ script, and tests
"frequenz-channels[dev-mkdocs,dev-noxfile,dev-pytest]",
"mypy == 1.6.1",
"types-Markdown == 3.5.0.0",
]
dev-noxfile = ["nox == 2023.4.22", "frequenz-repo-config[lib] == 0.7.5"]
dev-pylint = [
"pylint == 3.0.2",
# For checking the noxfile, docs/ script, and tests
"frequenz-channels[dev-mkdocs,dev-noxfile,dev-pytest]",
"pylint == 3.0.2",
]
dev-pytest = [
"pytest == 7.4.3",
"async-solipsism == 0.5",
"hypothesis == 6.88.1",
"frequenz-repo-config[extra-lint-examples] == 0.7.5",
"hypothesis == 6.88.1",
"pytest == 7.4.3",
"pytest-asyncio == 0.21.1",
"pytest-mock == 3.12.0",
]
Expand Down
38 changes: 27 additions & 11 deletions src/frequenz/channels/timer.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,16 @@ class TriggerAllMissed(MissedTickPolicy):
`T5`, happens at 5.1 (0.1 seconds late), so it triggers immediately
again. The seventh tick, `T6`, happens at 6.0, right on time.

```
0 1 2 3 4 o 5 6
o---------|-o-------|--o------|---------|--o------|o--------o-----> time
<center>
```bob
0 1 2 3 4 T4 5 6
*---------o-*-------o--*------o---------o--**-----o*--------*-----> time
daniel-zullo-frequenz marked this conversation as resolved.
Show resolved Hide resolved
T0 T1 T2 T3 T5 T6
T4

-o- "Expected ticks"
-*- "Delivered ticks"
```
</center>
"""

def calculate_next_tick_time(
Expand Down Expand Up @@ -134,11 +138,17 @@ class SkipMissedAndResync(MissedTickPolicy):
`T5`, happens at 5.1 (0.1 seconds late), so it triggers immediately
again. The seventh tick, `T6`, happens at 6.0, right on time.

<center>
```bob
0 1 2 3 4 T4 5 6
*---------o-*-------o--*------o---------o--*O-----o-*-------*-----> time
T0 T1 T2 T3 T5 T6

-o- "Expected ticks"
-*- "Delivered ticks"
-O- "Undelivered ticks (skipped)"
```
0 1 2 3 4 o 5 6
o---------|-o-------|--o------|---------|--o------|o--------o-----> time
T0 T1 T2 T3 T5 T6
```
</center>
"""

def calculate_next_tick_time(
Expand Down Expand Up @@ -187,11 +197,17 @@ class SkipMissedAndDrift(MissedTickPolicy):
so is right on time (no drift) and the same happens for tick `T6.3`,
which triggers at 6.3 seconds.

```
<center>
```bob
0 1 2 3 4 5 6
o---------|-o-------|--o------|---------|--o------|--o------|--o--> time
T0 T1 T2.2 T3.2 T5.3 T6.3
*---------o-*-------|-o*------|-O-------|-o*------|--*------|--*--> time
daniel-zullo-frequenz marked this conversation as resolved.
Show resolved Hide resolved
T0 T1.2 T2.2 T3.2 T4.2 T5.3 T6.3

-o- "Expected ticks"
-*- "Delivered ticks"
-O- "Undelivered ticks (skipped)"
```
</center>
"""

def __init__(self, *, delay_tolerance: timedelta = timedelta(0)):
Expand Down
Loading