From 2ad83f23c8760c7e5224a5217a16471bbba36cd4 Mon Sep 17 00:00:00 2001 From: Mark Backman Date: Fri, 6 Dec 2024 17:07:20 -0500 Subject: [PATCH 1/4] Initial reference docs commit --- .gitignore | 4 + {docs => docs-old}/ISSUE_TEMPLATE.md | 0 {docs => docs-old}/PULL_REQUEST_TEMPLATE.md | 0 {docs => docs-old}/README.md | 0 {docs => docs-old}/architecture.md | 0 {docs => docs-old}/frame-progress.md | 0 {docs => docs-old}/frame.md | 0 .../images/frame-progress-01.png | Bin .../images/frame-progress-02.png | Bin .../images/frame-progress-03.png | Bin .../images/frame-progress-04.png | Bin .../images/frame-progress-05.png | Bin .../images/frame-progress-06.png | Bin .../images/frame-progress-07.png | Bin .../images/frame-progress-08.png | Bin .../images/frame-progress-09.png | Bin .../images/frame-progress-10.png | Bin .../images/frame-progress-11.png | Bin .../images/frame-progress-12.png | Bin .../images/frame-progress-13.png | Bin .../images/frame-progress-14.png | Bin .../images/frame-progress-15.png | Bin docs/Makefile | 20 ++++ docs/conf.py | 41 +++++++ docs/generate_docs.py | 103 ++++++++++++++++++ docs/index.rst | 77 +++++++++++++ docs/make.bat | 35 ++++++ docs/requirements.txt | 5 + pyproject.toml | 9 +- src/pipecat/audio/vad/vad_analyzer.py | 2 +- src/pipecat/services/cartesia.py | 2 +- src/pipecat/services/gladia.py | 2 +- src/pipecat/services/nim.py | 8 -- src/pipecat/services/openai.py | 19 +++- src/pipecat/services/playht.py | 2 +- src/pipecat/transports/base_transport.py | 2 +- .../transports/network/fastapi_websocket.py | 2 +- .../transports/network/websocket_server.py | 2 +- 38 files changed, 315 insertions(+), 20 deletions(-) rename {docs => docs-old}/ISSUE_TEMPLATE.md (100%) rename {docs => docs-old}/PULL_REQUEST_TEMPLATE.md (100%) rename {docs => docs-old}/README.md (100%) rename {docs => docs-old}/architecture.md (100%) rename {docs => docs-old}/frame-progress.md (100%) rename {docs => docs-old}/frame.md (100%) rename {docs => docs-old}/images/frame-progress-01.png (100%) rename {docs => docs-old}/images/frame-progress-02.png (100%) rename {docs => docs-old}/images/frame-progress-03.png (100%) rename {docs => docs-old}/images/frame-progress-04.png (100%) rename {docs => docs-old}/images/frame-progress-05.png (100%) rename {docs => docs-old}/images/frame-progress-06.png (100%) rename {docs => docs-old}/images/frame-progress-07.png (100%) rename {docs => docs-old}/images/frame-progress-08.png (100%) rename {docs => docs-old}/images/frame-progress-09.png (100%) rename {docs => docs-old}/images/frame-progress-10.png (100%) rename {docs => docs-old}/images/frame-progress-11.png (100%) rename {docs => docs-old}/images/frame-progress-12.png (100%) rename {docs => docs-old}/images/frame-progress-13.png (100%) rename {docs => docs-old}/images/frame-progress-14.png (100%) rename {docs => docs-old}/images/frame-progress-15.png (100%) create mode 100644 docs/Makefile create mode 100644 docs/conf.py create mode 100644 docs/generate_docs.py create mode 100644 docs/index.rst create mode 100644 docs/make.bat create mode 100644 docs/requirements.txt diff --git a/.gitignore b/.gitignore index 50eae09a2..97bdc92c4 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,7 @@ fly.toml # Example files pipecat/examples/twilio-chatbot/templates/streams.xml + +# Documentation +docs/_build/ +docs/api/ \ No newline at end of file diff --git a/docs/ISSUE_TEMPLATE.md b/docs-old/ISSUE_TEMPLATE.md similarity index 100% rename from docs/ISSUE_TEMPLATE.md rename to docs-old/ISSUE_TEMPLATE.md diff --git a/docs/PULL_REQUEST_TEMPLATE.md b/docs-old/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from docs/PULL_REQUEST_TEMPLATE.md rename to docs-old/PULL_REQUEST_TEMPLATE.md diff --git a/docs/README.md b/docs-old/README.md similarity index 100% rename from docs/README.md rename to docs-old/README.md diff --git a/docs/architecture.md b/docs-old/architecture.md similarity index 100% rename from docs/architecture.md rename to docs-old/architecture.md diff --git a/docs/frame-progress.md b/docs-old/frame-progress.md similarity index 100% rename from docs/frame-progress.md rename to docs-old/frame-progress.md diff --git a/docs/frame.md b/docs-old/frame.md similarity index 100% rename from docs/frame.md rename to docs-old/frame.md diff --git a/docs/images/frame-progress-01.png b/docs-old/images/frame-progress-01.png similarity index 100% rename from docs/images/frame-progress-01.png rename to docs-old/images/frame-progress-01.png diff --git a/docs/images/frame-progress-02.png b/docs-old/images/frame-progress-02.png similarity index 100% rename from docs/images/frame-progress-02.png rename to docs-old/images/frame-progress-02.png diff --git a/docs/images/frame-progress-03.png b/docs-old/images/frame-progress-03.png similarity index 100% rename from docs/images/frame-progress-03.png rename to docs-old/images/frame-progress-03.png diff --git a/docs/images/frame-progress-04.png b/docs-old/images/frame-progress-04.png similarity index 100% rename from docs/images/frame-progress-04.png rename to docs-old/images/frame-progress-04.png diff --git a/docs/images/frame-progress-05.png b/docs-old/images/frame-progress-05.png similarity index 100% rename from docs/images/frame-progress-05.png rename to docs-old/images/frame-progress-05.png diff --git a/docs/images/frame-progress-06.png b/docs-old/images/frame-progress-06.png similarity index 100% rename from docs/images/frame-progress-06.png rename to docs-old/images/frame-progress-06.png diff --git a/docs/images/frame-progress-07.png b/docs-old/images/frame-progress-07.png similarity index 100% rename from docs/images/frame-progress-07.png rename to docs-old/images/frame-progress-07.png diff --git a/docs/images/frame-progress-08.png b/docs-old/images/frame-progress-08.png similarity index 100% rename from docs/images/frame-progress-08.png rename to docs-old/images/frame-progress-08.png diff --git a/docs/images/frame-progress-09.png b/docs-old/images/frame-progress-09.png similarity index 100% rename from docs/images/frame-progress-09.png rename to docs-old/images/frame-progress-09.png diff --git a/docs/images/frame-progress-10.png b/docs-old/images/frame-progress-10.png similarity index 100% rename from docs/images/frame-progress-10.png rename to docs-old/images/frame-progress-10.png diff --git a/docs/images/frame-progress-11.png b/docs-old/images/frame-progress-11.png similarity index 100% rename from docs/images/frame-progress-11.png rename to docs-old/images/frame-progress-11.png diff --git a/docs/images/frame-progress-12.png b/docs-old/images/frame-progress-12.png similarity index 100% rename from docs/images/frame-progress-12.png rename to docs-old/images/frame-progress-12.png diff --git a/docs/images/frame-progress-13.png b/docs-old/images/frame-progress-13.png similarity index 100% rename from docs/images/frame-progress-13.png rename to docs-old/images/frame-progress-13.png diff --git a/docs/images/frame-progress-14.png b/docs-old/images/frame-progress-14.png similarity index 100% rename from docs/images/frame-progress-14.png rename to docs-old/images/frame-progress-14.png diff --git a/docs/images/frame-progress-15.png b/docs-old/images/frame-progress-15.png similarity index 100% rename from docs/images/frame-progress-15.png rename to docs-old/images/frame-progress-15.png diff --git a/docs/Makefile b/docs/Makefile new file mode 100644 index 000000000..d4bb2cbb9 --- /dev/null +++ b/docs/Makefile @@ -0,0 +1,20 @@ +# Minimal makefile for Sphinx documentation +# + +# You can set these variables from the command line, and also +# from the environment for the first two. +SPHINXOPTS ?= +SPHINXBUILD ?= sphinx-build +SOURCEDIR = . +BUILDDIR = _build + +# Put it first so that "make" without argument is like "make help". +help: + @$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) + +.PHONY: help Makefile + +# Catch-all target: route all unknown targets to Sphinx using the new +# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS). +%: Makefile + @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) diff --git a/docs/conf.py b/docs/conf.py new file mode 100644 index 000000000..eab14f7e8 --- /dev/null +++ b/docs/conf.py @@ -0,0 +1,41 @@ +import sys +from pathlib import Path + +# Add source directory to path +docs_dir = Path(__file__).parent +project_root = docs_dir.parent +sys.path.insert(0, str(project_root / "src")) + +# Project information +project = "pipecat-ai" +copyright = "2024, Daily" +author = "Daily" + +# General configuration +extensions = [ + "sphinx.ext.autodoc", + "sphinx.ext.napoleon", + "sphinx.ext.viewcode", + "sphinx.ext.intersphinx", +] + +# Napoleon settings +napoleon_google_docstring = True +napoleon_numpy_docstring = False +napoleon_include_init_with_doc = True + +# AutoDoc settings +autodoc_default_options = { + "members": True, + "member-order": "bysource", + "special-members": "__init__", + "undoc-members": True, + "exclude-members": "__weakref__", + "no-index": True, +} + +# HTML output settings +html_theme = "sphinx_rtd_theme" +html_static_path = ["_static"] +autodoc_typehints = "description" +html_show_sphinx = False # Remove "Built with Sphinx" diff --git a/docs/generate_docs.py b/docs/generate_docs.py new file mode 100644 index 000000000..e68e3429c --- /dev/null +++ b/docs/generate_docs.py @@ -0,0 +1,103 @@ +#!/usr/bin/env python3 + +import shutil +import subprocess +from pathlib import Path + + +def run_command(command: list[str]) -> None: + """Run a command and exit if it fails.""" + print(f"Running: {' '.join(command)}") + try: + subprocess.run(command, check=True) + except subprocess.CalledProcessError as e: + print(f"Warning: Command failed: {' '.join(command)}") + print(f"Error: {e}") + + +def main(): + docs_dir = Path(__file__).parent + project_root = docs_dir.parent + + # Install documentation requirements + requirements_file = docs_dir / "requirements.txt" + run_command(["pip", "install", "-r", str(requirements_file)]) + + # Install core package + run_command(["pip", "install", "-e", "."]) + + # Install all service dependencies + services = [ + "anthropic", + "assemblyai", + "aws", + "azure", + "canonical", + "cartesia", + # "daily", + "deepgram", + "elevenlabs", + "fal", + "fireworks", + "gladia", + "google", + "grok", + "groq", + "langchain", + # "livekit", + "lmnt", + "moondream", + "nim", + "noisereduce", + "openai", + "openpipe", + "playht", + "silero", + "soundfile", + "websocket", + "whisper", + ] + + extras = ",".join(services) + try: + run_command(["pip", "install", "-e", f".[{extras}]"]) + except Exception as e: + print(f"Warning: Some dependencies failed to install: {e}") + + # Clean old files + api_dir = docs_dir / "api" + build_dir = docs_dir / "_build" + for dir in [api_dir, build_dir]: + if dir.exists(): + shutil.rmtree(dir) + + # Generate API documentation + run_command( + [ + "sphinx-apidoc", + "-f", # Force overwrite + "-e", # Put each module on its own page + "-M", # Put module documentation before submodule + "--no-toc", # Don't generate modules.rst (cleaner structure) + "-o", + str(api_dir), # Output directory + str(project_root / "src/pipecat"), + # Exclude problematic files and directories + "**/processors/gstreamer/*", # Optional gstreamer + "**/transports/network/*", # Pydantic issues + "**/transports/services/*", # Pydantic issues + "**/transports/local/*", # Optional dependencies + "**/services/to_be_updated/*", # Exclude to_be_updated package + "**/*test*", # Test files + ] + ) + + # Build HTML documentation + run_command(["sphinx-build", "-b", "html", str(docs_dir), str(build_dir / "html")]) + + print("\nDocumentation generated successfully!") + print(f"HTML docs: {build_dir}/html/index.html") + + +if __name__ == "__main__": + main() diff --git a/docs/index.rst b/docs/index.rst new file mode 100644 index 000000000..68afcb980 --- /dev/null +++ b/docs/index.rst @@ -0,0 +1,77 @@ +Pipecat API Reference Docs +========================== + +Welcome to Pipecat's API reference documentation! + +Pipecat is an open source framework for building voice and multimodal assistants. +It provides a flexible pipeline architecture for connecting various AI services, +audio processing, and transport layers. + +Quick Links +----------- + +* `GitHub Repository `_ +* `Website `_ + + +API Reference +------------- + +Core Components +~~~~~~~~~~~~~~~ + +* :mod:`pipecat.frames` +* :mod:`pipecat.processors` +* :mod:`pipecat.pipeline` + +Audio Processing +~~~~~~~~~~~~~~~~ + +* :mod:`pipecat.audio` +* :mod:`pipecat.vad` + +Services +~~~~~~~~ + +* :mod:`pipecat.services` + +Transport & Serialization +~~~~~~~~~~~~~~~~~~~~~~~~~ + +* :mod:`pipecat.transports` +* :mod:`pipecat.serializers` + +Utilities +~~~~~~~~~ + +* :mod:`pipecat.clocks` +* :mod:`pipecat.metrics` +* :mod:`pipecat.sync` +* :mod:`pipecat.transcriptions` +* :mod:`pipecat.utils` + +.. toctree:: + :maxdepth: 2 + :caption: API Reference + :hidden: + + api/pipecat.audio + api/pipecat.clocks + api/pipecat.frames + api/pipecat.metrics + api/pipecat.pipeline + api/pipecat.processors + api/pipecat.serializers + api/pipecat.services + api/pipecat.sync + api/pipecat.transcriptions + api/pipecat.transports + api/pipecat.utils + api/pipecat.vad + +Indices and tables +================== + +* :ref:`genindex` +* :ref:`modindex` +* :ref:`search` \ No newline at end of file diff --git a/docs/make.bat b/docs/make.bat new file mode 100644 index 000000000..32bb24529 --- /dev/null +++ b/docs/make.bat @@ -0,0 +1,35 @@ +@ECHO OFF + +pushd %~dp0 + +REM Command file for Sphinx documentation + +if "%SPHINXBUILD%" == "" ( + set SPHINXBUILD=sphinx-build +) +set SOURCEDIR=. +set BUILDDIR=_build + +%SPHINXBUILD% >NUL 2>NUL +if errorlevel 9009 ( + echo. + echo.The 'sphinx-build' command was not found. Make sure you have Sphinx + echo.installed, then set the SPHINXBUILD environment variable to point + echo.to the full path of the 'sphinx-build' executable. Alternatively you + echo.may add the Sphinx directory to PATH. + echo. + echo.If you don't have Sphinx installed, grab it from + echo.https://www.sphinx-doc.org/ + exit /b 1 +) + +if "%1" == "" goto help + +%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O% +goto end + +:help +%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O% + +:end +popd diff --git a/docs/requirements.txt b/docs/requirements.txt new file mode 100644 index 000000000..c1b9addb5 --- /dev/null +++ b/docs/requirements.txt @@ -0,0 +1,5 @@ +sphinx>=8.1.3 +sphinx-rtd-theme +sphinx-markdown-builder +sphinx-autodoc-typehints +toml \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 79026ddab..081c68c5f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -62,7 +62,7 @@ moondream = [ "einops~=0.8.0", "timm~=1.0.8", "transformers~=4.44.0" ] nim = [ "openai~=1.50.2" ] noisereduce = [ "noisereduce~=3.0.3" ] openai = [ "openai~=1.50.2", "websockets~=13.1", "python-deepcompare~=1.0.1" ] -openpipe = [ "openpipe~=4.24.0" ] +openpipe = [ "openpipe~=4.38.0" ] playht = [ "pyht~=0.1.4", "websockets~=13.1" ] silero = [ "onnxruntime~=1.19.2" ] soundfile = [ "soundfile~=0.12.1" ] @@ -84,3 +84,10 @@ fallback_version = "0.0.0-dev" [tool.ruff] exclude = ["*_pb2.py"] line-length = 100 + +select = [ + "D", # Docstring rules +] + +[tool.ruff.pydocstyle] +convention = "google" \ No newline at end of file diff --git a/src/pipecat/audio/vad/vad_analyzer.py b/src/pipecat/audio/vad/vad_analyzer.py index 17bce6543..c291db7f3 100644 --- a/src/pipecat/audio/vad/vad_analyzer.py +++ b/src/pipecat/audio/vad/vad_analyzer.py @@ -8,7 +8,7 @@ from abc import abstractmethod from enum import Enum from loguru import logger -from pydantic.main import BaseModel +from pydantic import BaseModel from pipecat.audio.utils import calculate_audio_volume, exp_smoothing diff --git a/src/pipecat/services/cartesia.py b/src/pipecat/services/cartesia.py index a526d7333..8683fd29a 100644 --- a/src/pipecat/services/cartesia.py +++ b/src/pipecat/services/cartesia.py @@ -11,7 +11,7 @@ import uuid from typing import AsyncGenerator, List, Optional, Union from loguru import logger -from pydantic.main import BaseModel +from pydantic import BaseModel from pipecat.frames.frames import ( BotStoppedSpeakingFrame, diff --git a/src/pipecat/services/gladia.py b/src/pipecat/services/gladia.py index c659a20ac..8909c4bb2 100644 --- a/src/pipecat/services/gladia.py +++ b/src/pipecat/services/gladia.py @@ -10,7 +10,7 @@ from typing import AsyncGenerator, Optional import aiohttp from loguru import logger -from pydantic.main import BaseModel +from pydantic import BaseModel from pipecat.frames.frames import ( CancelFrame, diff --git a/src/pipecat/services/nim.py b/src/pipecat/services/nim.py index 0ce0171c9..2b57a5047 100644 --- a/src/pipecat/services/nim.py +++ b/src/pipecat/services/nim.py @@ -22,14 +22,6 @@ class NimLLMService(OpenAILLMService): base_url (str, optional): The base URL for NIM API. Defaults to "https://integrate.api.nvidia.com/v1" model (str, optional): The model identifier to use. Defaults to "nvidia/llama-3.1-nemotron-70b-instruct" **kwargs: Additional keyword arguments passed to OpenAILLMService - - Example: - ```python - service = NimLLMService( - api_key="your-api-key", - model="nvidia/llama-3.1-nemotron-70b-instruct" - ) - ``` """ def __init__( diff --git a/src/pipecat/services/openai.py b/src/pipecat/services/openai.py index b6927e8dc..4e11edc22 100644 --- a/src/pipecat/services/openai.py +++ b/src/pipecat/services/openai.py @@ -379,14 +379,25 @@ class OpenAIImageGenService(ImageGenService): class OpenAITTSService(TTSService): - """This service uses the OpenAI TTS API to generate audio from text. - The returned audio is PCM encoded at 24kHz. When using the DailyTransport, set the sample rate in the DailyParams accordingly: - ``` + """OpenAI Text-to-Speech service that generates audio from text. + + This service uses the OpenAI TTS API to generate PCM-encoded audio at 24kHz. + When using with DailyTransport, configure the sample rate in DailyParams + as shown below: + DailyParams( audio_out_enabled=True, audio_out_sample_rate=24_000, ) - ``` + + Args: + api_key: OpenAI API key. Defaults to None. + voice: Voice ID to use. Defaults to "alloy". + model: TTS model to use ("tts-1" or "tts-1-hd"). Defaults to "tts-1". + sample_rate: Output audio sample rate in Hz. Defaults to 24000. + **kwargs: Additional keyword arguments passed to TTSService. + + The service returns PCM-encoded audio at the specified sample rate. """ def __init__( diff --git a/src/pipecat/services/playht.py b/src/pipecat/services/playht.py index d272ee361..78be924af 100644 --- a/src/pipecat/services/playht.py +++ b/src/pipecat/services/playht.py @@ -14,7 +14,7 @@ from typing import AsyncGenerator, Optional import aiohttp import websockets from loguru import logger -from pydantic.main import BaseModel +from pydantic import BaseModel from pipecat.frames.frames import ( BotStoppedSpeakingFrame, diff --git a/src/pipecat/transports/base_transport.py b/src/pipecat/transports/base_transport.py index 3eac820f2..91f95fbbc 100644 --- a/src/pipecat/transports/base_transport.py +++ b/src/pipecat/transports/base_transport.py @@ -11,7 +11,7 @@ from abc import ABC, abstractmethod from typing import Optional from pydantic import ConfigDict -from pydantic.main import BaseModel +from pydantic import BaseModel from pipecat.audio.filters.base_audio_filter import BaseAudioFilter from pipecat.audio.mixers.base_audio_mixer import BaseAudioMixer diff --git a/src/pipecat/transports/network/fastapi_websocket.py b/src/pipecat/transports/network/fastapi_websocket.py index de1cf531e..cd21fbe0d 100644 --- a/src/pipecat/transports/network/fastapi_websocket.py +++ b/src/pipecat/transports/network/fastapi_websocket.py @@ -12,7 +12,7 @@ import typing import wave from typing import Awaitable, Callable -from pydantic.main import BaseModel +from pydantic import BaseModel from pipecat.frames.frames import ( Frame, diff --git a/src/pipecat/transports/network/websocket_server.py b/src/pipecat/transports/network/websocket_server.py index 567dbac7d..711bc7596 100644 --- a/src/pipecat/transports/network/websocket_server.py +++ b/src/pipecat/transports/network/websocket_server.py @@ -10,7 +10,7 @@ import time import wave from typing import Awaitable, Callable -from pydantic.main import BaseModel +from pydantic import BaseModel from pipecat.frames.frames import ( CancelFrame, From 16de1fca9b2c880678bc6e20830fb225f110bbe3 Mon Sep 17 00:00:00 2001 From: Mark Backman Date: Fri, 6 Dec 2024 20:15:17 -0500 Subject: [PATCH 2/4] Add Read the Docs config --- .readthedocs.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .readthedocs.yaml diff --git a/.readthedocs.yaml b/.readthedocs.yaml new file mode 100644 index 000000000..8cf3196ca --- /dev/null +++ b/.readthedocs.yaml @@ -0,0 +1,15 @@ +version: 2 + +build: + os: ubuntu-22.04 + tools: + python: '3.12' + +sphinx: + configuration: docs/conf.py + +python: + install: + - requirements: docs/requirements.txt + - method: pip + path: . From 61d0fa42f1f09c80eededa395b71a8e8dcfaaf84 Mon Sep 17 00:00:00 2001 From: Mark Backman Date: Fri, 6 Dec 2024 20:26:36 -0500 Subject: [PATCH 3/4] Add a workflow to generate the docs --- .github/workflows/generate_docs.yaml | 47 ++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 .github/workflows/generate_docs.yaml diff --git a/.github/workflows/generate_docs.yaml b/.github/workflows/generate_docs.yaml new file mode 100644 index 000000000..d25b461bf --- /dev/null +++ b/.github/workflows/generate_docs.yaml @@ -0,0 +1,47 @@ +name: Generate API Documentation + +on: + release: + types: [published] # Run on new release + workflow_dispatch: # Manual trigger + +jobs: + update-docs: + runs-on: ubuntu-latest + permissions: + contents: write + pull-requests: write + + steps: + - uses: actions/checkout@v4 + + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: '3.12' + + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install -r docs/requirements.txt + pip install . + + - name: Generate API documentation + run: | + cd docs + python generate_docs.py + + - name: Create Pull Request + uses: peter-evans/create-pull-request@v5 + with: + commit-message: 'docs: Update API documentation' + title: 'docs: Update API documentation' + body: | + Automated PR to update API documentation. + + - Generated using `generate_docs.py` + - Triggered by: ${{ github.event_name }} + branch: update-api-docs + delete-branch: true + labels: | + documentation From 2d3864ee09f6d19a8efa01d7b30a6abac8bf8c11 Mon Sep 17 00:00:00 2001 From: Mark Backman Date: Mon, 9 Dec 2024 20:39:29 -0500 Subject: [PATCH 4/4] Move API docs generation to docs/api --- .github/workflows/generate_docs.yaml | 6 ++--- .gitignore | 4 ++-- .readthedocs.yaml | 4 ++-- {docs-old => docs}/ISSUE_TEMPLATE.md | 0 {docs-old => docs}/PULL_REQUEST_TEMPLATE.md | 0 {docs-old => docs}/README.md | 0 docs/{ => api}/Makefile | 0 docs/{ => api}/conf.py | 0 docs/{ => api}/generate_docs.py | 21 +++++++++--------- docs/{ => api}/index.rst | 0 docs/{ => api}/make.bat | 0 docs/{ => api}/requirements.txt | 0 {docs-old => docs}/architecture.md | 0 {docs-old => docs}/frame-progress.md | 0 {docs-old => docs}/frame.md | 0 .../images/frame-progress-01.png | Bin .../images/frame-progress-02.png | Bin .../images/frame-progress-03.png | Bin .../images/frame-progress-04.png | Bin .../images/frame-progress-05.png | Bin .../images/frame-progress-06.png | Bin .../images/frame-progress-07.png | Bin .../images/frame-progress-08.png | Bin .../images/frame-progress-09.png | Bin .../images/frame-progress-10.png | Bin .../images/frame-progress-11.png | Bin .../images/frame-progress-12.png | Bin .../images/frame-progress-13.png | Bin .../images/frame-progress-14.png | Bin .../images/frame-progress-15.png | Bin 30 files changed, 18 insertions(+), 17 deletions(-) rename {docs-old => docs}/ISSUE_TEMPLATE.md (100%) rename {docs-old => docs}/PULL_REQUEST_TEMPLATE.md (100%) rename {docs-old => docs}/README.md (100%) rename docs/{ => api}/Makefile (100%) rename docs/{ => api}/conf.py (100%) rename docs/{ => api}/generate_docs.py (75%) rename docs/{ => api}/index.rst (100%) rename docs/{ => api}/make.bat (100%) rename docs/{ => api}/requirements.txt (100%) rename {docs-old => docs}/architecture.md (100%) rename {docs-old => docs}/frame-progress.md (100%) rename {docs-old => docs}/frame.md (100%) rename {docs-old => docs}/images/frame-progress-01.png (100%) rename {docs-old => docs}/images/frame-progress-02.png (100%) rename {docs-old => docs}/images/frame-progress-03.png (100%) rename {docs-old => docs}/images/frame-progress-04.png (100%) rename {docs-old => docs}/images/frame-progress-05.png (100%) rename {docs-old => docs}/images/frame-progress-06.png (100%) rename {docs-old => docs}/images/frame-progress-07.png (100%) rename {docs-old => docs}/images/frame-progress-08.png (100%) rename {docs-old => docs}/images/frame-progress-09.png (100%) rename {docs-old => docs}/images/frame-progress-10.png (100%) rename {docs-old => docs}/images/frame-progress-11.png (100%) rename {docs-old => docs}/images/frame-progress-12.png (100%) rename {docs-old => docs}/images/frame-progress-13.png (100%) rename {docs-old => docs}/images/frame-progress-14.png (100%) rename {docs-old => docs}/images/frame-progress-15.png (100%) diff --git a/.github/workflows/generate_docs.yaml b/.github/workflows/generate_docs.yaml index d25b461bf..242984d8a 100644 --- a/.github/workflows/generate_docs.yaml +++ b/.github/workflows/generate_docs.yaml @@ -23,12 +23,12 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install -r docs/requirements.txt + pip install -r docs/api/requirements.txt pip install . - name: Generate API documentation run: | - cd docs + cd docs/api python generate_docs.py - name: Create Pull Request @@ -39,7 +39,7 @@ jobs: body: | Automated PR to update API documentation. - - Generated using `generate_docs.py` + - Generated using `docs/api/generate_docs.py` - Triggered by: ${{ github.event_name }} branch: update-api-docs delete-branch: true diff --git a/.gitignore b/.gitignore index 97bdc92c4..50944a3a8 100644 --- a/.gitignore +++ b/.gitignore @@ -34,5 +34,5 @@ fly.toml pipecat/examples/twilio-chatbot/templates/streams.xml # Documentation -docs/_build/ -docs/api/ \ No newline at end of file +docs/api/_build/ +docs/api/api \ No newline at end of file diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 8cf3196ca..667e789d9 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -6,10 +6,10 @@ build: python: '3.12' sphinx: - configuration: docs/conf.py + configuration: docs/api/conf.py python: install: - - requirements: docs/requirements.txt + - requirements: docs/api/requirements.txt - method: pip path: . diff --git a/docs-old/ISSUE_TEMPLATE.md b/docs/ISSUE_TEMPLATE.md similarity index 100% rename from docs-old/ISSUE_TEMPLATE.md rename to docs/ISSUE_TEMPLATE.md diff --git a/docs-old/PULL_REQUEST_TEMPLATE.md b/docs/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from docs-old/PULL_REQUEST_TEMPLATE.md rename to docs/PULL_REQUEST_TEMPLATE.md diff --git a/docs-old/README.md b/docs/README.md similarity index 100% rename from docs-old/README.md rename to docs/README.md diff --git a/docs/Makefile b/docs/api/Makefile similarity index 100% rename from docs/Makefile rename to docs/api/Makefile diff --git a/docs/conf.py b/docs/api/conf.py similarity index 100% rename from docs/conf.py rename to docs/api/conf.py diff --git a/docs/generate_docs.py b/docs/api/generate_docs.py similarity index 75% rename from docs/generate_docs.py rename to docs/api/generate_docs.py index e68e3429c..972ea3c89 100644 --- a/docs/generate_docs.py +++ b/docs/api/generate_docs.py @@ -17,14 +17,14 @@ def run_command(command: list[str]) -> None: def main(): docs_dir = Path(__file__).parent - project_root = docs_dir.parent + project_root = docs_dir.parent.parent # Install documentation requirements requirements_file = docs_dir / "requirements.txt" run_command(["pip", "install", "-r", str(requirements_file)]) - # Install core package - run_command(["pip", "install", "-e", "."]) + # Install from project root, not docs directory + run_command(["pip", "install", "-e", str(project_root)]) # Install all service dependencies services = [ @@ -60,7 +60,7 @@ def main(): extras = ",".join(services) try: - run_command(["pip", "install", "-e", f".[{extras}]"]) + run_command(["pip", "install", "-e", f"{str(project_root)}[{extras}]"]) except Exception as e: print(f"Warning: Some dependencies failed to install: {e}") @@ -83,12 +83,13 @@ def main(): str(api_dir), # Output directory str(project_root / "src/pipecat"), # Exclude problematic files and directories - "**/processors/gstreamer/*", # Optional gstreamer - "**/transports/network/*", # Pydantic issues - "**/transports/services/*", # Pydantic issues - "**/transports/local/*", # Optional dependencies - "**/services/to_be_updated/*", # Exclude to_be_updated package - "**/*test*", # Test files + str(project_root / "src/pipecat/processors/gstreamer"), # Optional gstreamer + str(project_root / "src/pipecat/transports/network"), # Pydantic issues + str(project_root / "src/pipecat/transports/services"), # Pydantic issues + str(project_root / "src/pipecat/transports/local"), # Optional dependencies + str(project_root / "src/pipecat/services/to_be_updated"), # Exclude to_be_updated + "**/test_*.py", # Test files + "**/tests/*.py", # Test files ] ) diff --git a/docs/index.rst b/docs/api/index.rst similarity index 100% rename from docs/index.rst rename to docs/api/index.rst diff --git a/docs/make.bat b/docs/api/make.bat similarity index 100% rename from docs/make.bat rename to docs/api/make.bat diff --git a/docs/requirements.txt b/docs/api/requirements.txt similarity index 100% rename from docs/requirements.txt rename to docs/api/requirements.txt diff --git a/docs-old/architecture.md b/docs/architecture.md similarity index 100% rename from docs-old/architecture.md rename to docs/architecture.md diff --git a/docs-old/frame-progress.md b/docs/frame-progress.md similarity index 100% rename from docs-old/frame-progress.md rename to docs/frame-progress.md diff --git a/docs-old/frame.md b/docs/frame.md similarity index 100% rename from docs-old/frame.md rename to docs/frame.md diff --git a/docs-old/images/frame-progress-01.png b/docs/images/frame-progress-01.png similarity index 100% rename from docs-old/images/frame-progress-01.png rename to docs/images/frame-progress-01.png diff --git a/docs-old/images/frame-progress-02.png b/docs/images/frame-progress-02.png similarity index 100% rename from docs-old/images/frame-progress-02.png rename to docs/images/frame-progress-02.png diff --git a/docs-old/images/frame-progress-03.png b/docs/images/frame-progress-03.png similarity index 100% rename from docs-old/images/frame-progress-03.png rename to docs/images/frame-progress-03.png diff --git a/docs-old/images/frame-progress-04.png b/docs/images/frame-progress-04.png similarity index 100% rename from docs-old/images/frame-progress-04.png rename to docs/images/frame-progress-04.png diff --git a/docs-old/images/frame-progress-05.png b/docs/images/frame-progress-05.png similarity index 100% rename from docs-old/images/frame-progress-05.png rename to docs/images/frame-progress-05.png diff --git a/docs-old/images/frame-progress-06.png b/docs/images/frame-progress-06.png similarity index 100% rename from docs-old/images/frame-progress-06.png rename to docs/images/frame-progress-06.png diff --git a/docs-old/images/frame-progress-07.png b/docs/images/frame-progress-07.png similarity index 100% rename from docs-old/images/frame-progress-07.png rename to docs/images/frame-progress-07.png diff --git a/docs-old/images/frame-progress-08.png b/docs/images/frame-progress-08.png similarity index 100% rename from docs-old/images/frame-progress-08.png rename to docs/images/frame-progress-08.png diff --git a/docs-old/images/frame-progress-09.png b/docs/images/frame-progress-09.png similarity index 100% rename from docs-old/images/frame-progress-09.png rename to docs/images/frame-progress-09.png diff --git a/docs-old/images/frame-progress-10.png b/docs/images/frame-progress-10.png similarity index 100% rename from docs-old/images/frame-progress-10.png rename to docs/images/frame-progress-10.png diff --git a/docs-old/images/frame-progress-11.png b/docs/images/frame-progress-11.png similarity index 100% rename from docs-old/images/frame-progress-11.png rename to docs/images/frame-progress-11.png diff --git a/docs-old/images/frame-progress-12.png b/docs/images/frame-progress-12.png similarity index 100% rename from docs-old/images/frame-progress-12.png rename to docs/images/frame-progress-12.png diff --git a/docs-old/images/frame-progress-13.png b/docs/images/frame-progress-13.png similarity index 100% rename from docs-old/images/frame-progress-13.png rename to docs/images/frame-progress-13.png diff --git a/docs-old/images/frame-progress-14.png b/docs/images/frame-progress-14.png similarity index 100% rename from docs-old/images/frame-progress-14.png rename to docs/images/frame-progress-14.png diff --git a/docs-old/images/frame-progress-15.png b/docs/images/frame-progress-15.png similarity index 100% rename from docs-old/images/frame-progress-15.png rename to docs/images/frame-progress-15.png