feat: merge main

README.md

@@ -194,7 +194,21 @@ ### Code walkthrough
 ## QuickStart
 It is difficult to install and configure the local environment for some users. The following tutorials will allow you to quickly experience the charm of MetaGPT.  
 
-- [MetaGPT quickstart](https://deepwisdom.feishu.cn/wiki/Q8ycw6J9tiNXdHk66MRcIN8Pnlg)
+- [MetaGPT quickstart](https://deepwisdom.feishu.cn/wiki/CyY9wdJc4iNqArku3Lncl4v8n2b)
+
+## Citation
+
+For now, cite the [Arxiv paper](https://arxiv.org/abs/2308.00352):
+```bibtex
+@misc{hong2023metagpt,
+      title={MetaGPT: Meta Programming for Multi-Agent Collaborative Framework}, 
+      author={Sirui Hong and Xiawu Zheng and Jonathan Chen and Yuheng Cheng and Jinlin Wang and Ceyao Zhang and Zili Wang and Steven Ka Shing Yau and Zijuan Lin and Liyang Zhou and Chenyu Ran and Lingfeng Xiao and Chenglin Wu},
+      year={2023},
+      eprint={2308.00352},
+      archivePrefix={arXiv},
+      primaryClass={cs.AI}
+}
+```
 
 ## Contact Information
 

docs/README_CN.md

@@ -178,7 +178,7 @@ ### 代码实现
 ## 快速体验
 对一些用户来说，安装配置本地环境是有困难的，下面这些教程能够让你快速体验到MetaGPT的魅力。  
 
-- [MetaGPT快速体验](https://deepwisdom.feishu.cn/wiki/CyY9wdJc4iNqArku3Lncl4v8n2b)
+- [MetaGPT快速体验](https://deepwisdom.feishu.cn/wiki/Q8ycw6J9tiNXdHk66MRcIN8Pnlg)
 
 ## 联系信息
 
@@ -195,8 +195,6 @@ ## 演示
 
 ## 加入微信讨论群
 
-<img src="resources/20230808-002840.jpg" width = "30%" height = "30%" alt="MetaGPT WeChat Discuss Group" align=center />
+添加运营小姐姐，拉你入群
 
-如果群已满，请添加负责人微信，会邀请进群
-
-<img src="resources/MetaGPT-WeChat-Personal.jpeg" width = "30%" height = "30%" alt="MetaGPT WeChat Discuss Group" align=center />
+<img src="resources/20230808-220924.jpg" width = "30%" height = "30%" alt="MetaGPT WeChat Discuss Group" align=center />

docs/README_JA.md

@@ -75,25 +75,25 @@ ### Docker によるインストール
 
 ```bash
 # ステップ 1: metagpt 公式イメージをダウンロードし、config.yaml を準備する
-docker pull metagpt/metagpt:v0.3
+docker pull metagpt/metagpt:v0.3.1
 mkdir -p /opt/metagpt/{config,workspace}
-docker run --rm metagpt/metagpt:v0.3 cat /app/metagpt/config/config.yaml > /opt/metagpt/config/config.yaml
-vim /opt/metagpt/config/config.yaml # 設定を変更する
+docker run --rm metagpt/metagpt:v0.3.1 cat /app/metagpt/config/config.yaml > /opt/metagpt/config/key.yaml
+vim /opt/metagpt/config/key.yaml # 設定を変更する
 
 # ステップ 2: コンテナで metagpt デモを実行する
 docker run --rm \
     --privileged \
-    -v /opt/metagpt/config:/app/metagpt/config \
+    -v /opt/metagpt/config/key.yaml:/app/metagpt/config/key.yaml \
     -v /opt/metagpt/workspace:/app/metagpt/workspace \
-    metagpt/metagpt:v0.3 \
+    metagpt/metagpt:v0.3.1 \
     python startup.py "Write a cli snake game"
 
 # コンテナを起動し、その中でコマンドを実行することもできます
 docker run --name metagpt -d \
     --privileged \
-    -v /opt/metagpt/config:/app/metagpt/config \
+    -v /opt/metagpt/config/key.yaml:/app/metagpt/config/key.yaml \
     -v /opt/metagpt/workspace:/app/metagpt/workspace \
-    metagpt/metagpt:v0.3
+    metagpt/metagpt:v0.3.1
 
 docker exec -it metagpt /bin/bash
 $ python startup.py "Write a cli snake game"
@@ -111,7 +111,7 @@ ### 自分でイメージをビルドする
 ```bash
 # また、自分で metagpt イメージを構築することもできます。
 git clone https://github.com/geekan/MetaGPT.git
-cd MetaGPT && docker build -t metagpt:v0.3 .
+cd MetaGPT && docker build -t metagpt:custom .
 ```
 
 ## 設定
@@ -142,37 +142,36 @@ ### プラットフォームまたはツールの設定
 
 要件を述べるときに、どのプラットフォームまたはツールを使用するかを指定できます。
 ```shell
-python startup.py "Write a cli snake game based on pygame"
+python startup.py "pygame をベースとした cli ヘビゲームを書く"
 ```
-
 ### 使用方法
 
 ```
-NAME
-    startup.py - We are a software startup comprised of AI. By investing in us, you are empowering a future filled with limitless possibilities.
+会社名
+    startup.py - 私たちは AI で構成されたソフトウェア・スタートアップです。私たちに投資することは、無限の可能性に満ちた未来に力を与えることです。
 
-SYNOPSIS
+シノプシス
     startup.py IDEA <flags>
 
-DESCRIPTION
-    We are a software startup comprised of AI. By investing in us, you are empowering a future filled with limitless possibilities.
+説明
+    私たちは AI で構成されたソフトウェア・スタートアップです。私たちに投資することは、無限の可能性に満ちた未来に力を与えることです。
 
-POSITIONAL ARGUMENTS
+位置引数
     IDEA
-        Type: str
-        Your innovative idea, such as "Creating a snake game."
+        型: str
+        あなたの革新的なアイデア、例えば"スネークゲームを作る。"など
 
-FLAGS
+フラグ
     --investment=INVESTMENT
-        Type: float
-        Default: 3.0
-        As an investor, you have the opportunity to contribute a certain dollar amount to this AI company.
+        型: float
+        デフォルト: 3.0
+        投資家として、あなたはこの AI 企業に一定の金額を拠出する機会がある。
     --n_round=N_ROUND
-        Type: int
-        Default: 5
+        型: int
+        デフォルト: 5
 
-NOTES
-    You can also use flags syntax for POSITIONAL ARGUMENTS
+注意事項
+    位置引数にフラグ構文を使うこともできます
 ```
 
 ### コードウォークスルー
@@ -192,6 +191,11 @@ ### コードウォークスルー
 
 `examples` でシングル・ロール（ナレッジ・ベース付き）と LLM のみの例を詳しく見ることができます。
 
+## クイックスタート
+ローカル環境のインストールや設定は、ユーザーによっては難しいものです。以下のチュートリアルで MetaGPT の魅力をすぐに体験できます。
+
+- [MetaGPT クイックスタート](https://deepwisdom.feishu.cn/wiki/Q8ycw6J9tiNXdHk66MRcIN8Pnlg)
+
 ## お問い合わせ先
 
 このプロジェクトに関するご質問やご意見がございましたら、お気軽にお問い合わせください。皆様のご意見をお待ちしております！

metagpt/actions/write_docstring.py

@@ -0,0 +1,214 @@
+"""Code Docstring Generator.
+
+This script provides a tool to automatically generate docstrings for Python code. It uses the specified style to create
+docstrings for the given code and system text.
+
+Usage:
+    python3 -m metagpt.actions.write_docstring <filename> [--overwrite] [--style=<docstring_style>]
+
+Arguments:
+    filename           The path to the Python file for which you want to generate docstrings.
+
+Options:
+    --overwrite        If specified, overwrite the original file with the code containing docstrings.
+    --style=<docstring_style>   Specify the style of the generated docstrings.
+                                Valid values: 'google', 'numpy', or 'sphinx'.
+                                Default: 'google'
+
+Example:
+    python3 -m metagpt.actions.write_docstring startup.py --overwrite False --style=numpy
+
+This script uses the 'fire' library to create a command-line interface. It generates docstrings for the given Python code using
+the specified docstring style and adds them to the code.
+"""
+import ast
+from typing import Literal
+
+from metagpt.actions.action import Action
+from metagpt.utils.common import OutputParser
+from metagpt.utils.pycst import merge_docstring
+
+PYTHON_DOCSTRING_SYSTEM = '''### Requirements
+1. Add docstrings to the given code following the {style} style.
+2. Replace the function body with an Ellipsis object(...) to reduce output.
+3. If the types are already annotated, there is no need to include them in the docstring.
+4. Extract only class, function or the docstrings for the module parts from the given Python code, avoiding any other text.
+
+### Input Example
+```python
+def function_with_pep484_type_annotations(param1: int) -> bool:
+    return isinstance(param1, int)
+
+class ExampleError(Exception):
+    def __init__(self, msg: str):
+        self.msg = msg
+```
+
+### Output Example
+```python
+{example}
+```
+'''
+
+# https://www.sphinx-doc.org/en/master/usage/extensions/napoleon.html
+
+PYTHON_DOCSTRING_EXAMPLE_GOOGLE = '''
+def function_with_pep484_type_annotations(param1: int) -> bool:
+    """Example function with PEP 484 type annotations.
+
+    Extended description of function.
+
+    Args:
+        param1: The first parameter.
+
+    Returns:
+        The return value. True for success, False otherwise.
+    """
+    ...
+
+class ExampleError(Exception):
+    """Exceptions are documented in the same way as classes.
+
+    The __init__ method was documented in the class level docstring.
+
+    Args:
+        msg: Human readable string describing the exception.
+
+    Attributes:
+        msg: Human readable string describing the exception.
+    """
+    ...
+'''
+
+PYTHON_DOCSTRING_EXAMPLE_NUMPY = '''
+def function_with_pep484_type_annotations(param1: int) -> bool:
+    """
+    Example function with PEP 484 type annotations.
+
+    Extended description of function.
+
+    Parameters
+    ----------
+    param1
+        The first parameter.
+
+    Returns
+    -------
+    bool
+        The return value. True for success, False otherwise.
+    """
+    ...
+
+class ExampleError(Exception):
+    """
+    Exceptions are documented in the same way as classes.
+
+    The __init__ method was documented in the class level docstring.
+
+    Parameters
+    ----------
+    msg
+        Human readable string describing the exception.
+
+    Attributes
+    ----------
+    msg
+        Human readable string describing the exception.
+    """
+    ...
+'''
+
+PYTHON_DOCSTRING_EXAMPLE_SPHINX = '''
+def function_with_pep484_type_annotations(param1: int) -> bool:
+    """Example function with PEP 484 type annotations.
+
+    Extended description of function.
+
+    :param param1: The first parameter.
+    :type param1: int
+
+    :return: The return value. True for success, False otherwise.
+    :rtype: bool
+    """
+    ...
+
+class ExampleError(Exception):
+    """Exceptions are documented in the same way as classes.
+
+    The __init__ method was documented in the class level docstring.
+
+    :param msg: Human-readable string describing the exception.
+    :type msg: str
+    """
+    ...
+'''
+
+_python_docstring_style = {
+    "google": PYTHON_DOCSTRING_EXAMPLE_GOOGLE.strip(),
+    "numpy": PYTHON_DOCSTRING_EXAMPLE_NUMPY.strip(),
+    "sphinx": PYTHON_DOCSTRING_EXAMPLE_SPHINX.strip(),
+}
+
+
+class WriteDocstring(Action):
+    """This class is used to write docstrings for code.
+
+    Attributes:
+        desc: A string describing the action.
+    """
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.desc = "Write docstring for code."
+
+    async def run(
+        self, code: str,
+        system_text: str = PYTHON_DOCSTRING_SYSTEM,
+        style: Literal["google", "numpy", "sphinx"] = "google",
+    ) -> str:
+        """Writes docstrings for the given code and system text in the specified style.
+
+        Args:
+            code: A string of Python code.
+            system_text: A string of system text.
+            style: A string specifying the style of the docstring. Can be 'google', 'numpy', or 'sphinx'.
+
+        Returns:
+            The Python code with docstrings added.
+        """
+        system_text = system_text.format(style=style, example=_python_docstring_style[style])
+        simplified_code = _simplify_python_code(code)
+        documented_code = await self._aask(f"```python\n{simplified_code}\n```", [system_text])
+        documented_code = OutputParser.parse_python_code(documented_code)
+        return merge_docstring(code, documented_code)
+
+
+def _simplify_python_code(code: str) -> None:
+    """Simplifies the given Python code by removing expressions and the last if statement.
+
+    Args:
+        code: A string of Python code.
+
+    Returns:
+        The simplified Python code.
+    """
+    code_tree = ast.parse(code)
+    code_tree.body = [i for i in code_tree.body if not isinstance(i, ast.Expr)]
+    if isinstance(code_tree.body[-1], ast.If):
+        code_tree.body.pop()
+    return ast.unparse(code_tree)
+
+
+if __name__ == "__main__":
+    import fire
+
+    async def run(filename: str, overwrite: bool = False, style: Literal["google", "numpy", "sphinx"] = "google"):
+        with open(filename) as f:
+            code = f.read()
+        code = await WriteDocstring().run(code, style=style)
+        if overwrite:
+            with open(filename, "w") as f:
+                f.write(code)
+        return code
+
+    fire.Fire(run)

metagpt/utils/common.py

@@ -6,6 +6,7 @@
 @File    : common.py
 """
 import ast
+import contextlib
 import inspect
 import os
 import re
@@ -78,6 +79,23 @@ class OutputParser:
         else:
             tasks = text.split("\n")
         return tasks
+    
+    @staticmethod
+    def parse_python_code(text: str) -> str:
+        for pattern in (
+            r'(.*?```python.*?\s+)?(?P<code>.*)(```.*?)', 
+            r'(.*?```python.*?\s+)?(?P<code>.*)', 
+        ):
+            match = re.search(pattern, text, re.DOTALL)
+            if not match:
+                continue
+            code = match.group("code")
+            if not code:
+                continue
+            with contextlib.suppress(Exception):
+                ast.parse(code)
+                return code
+        raise ValueError("Invalid python code")
 
     @classmethod
     def parse_data(cls, data):
@@ -231,7 +249,8 @@ def print_members(module, indent=0):
         elif inspect.ismethod(obj):
             print(f'{prefix}Method: {name}')
 
+
 def parse_recipient(text):
-    pattern = "## Send To:\s*([A-Za-z]+)\s*?" # hard code for now
+    pattern = r"## Send To:\s*([A-Za-z]+)\s*?"  # hard code for now
     recipient = re.search(pattern, text)
     return recipient.group(1) if recipient else ""

metagpt/utils/pycst.py

@@ -0,0 +1,166 @@
+from __future__ import annotations
+
+from typing import Union
+
+import libcst as cst
+from libcst._nodes.module import Module
+
+DocstringNode = Union[cst.Module, cst.ClassDef, cst.FunctionDef]
+
+
+def get_docstring_statement(body: DocstringNode) -> cst.SimpleStatementLine:
+    """Extracts the docstring from the body of a node.
+
+    Args:
+        body: The body of a node.
+
+    Returns:
+        The docstring statement if it exists, None otherwise.
+    """
+    if isinstance(body, cst.Module):
+        body = body.body
+    else:
+        body = body.body.body
+
+    if not body:
+        return
+
+    statement = body[0]
+    if not isinstance(statement, cst.SimpleStatementLine):
+        return
+
+    expr = statement
+    while isinstance(expr, (cst.BaseSuite, cst.SimpleStatementLine)):
+        if len(expr.body) == 0:
+            return None
+        expr = expr.body[0]
+
+    if not isinstance(expr, cst.Expr):
+        return None
+    
+    val = expr.value
+    if not isinstance(val, (cst.SimpleString, cst.ConcatenatedString)):
+        return None
+    
+    evaluated_value = val.evaluated_value    
+    if isinstance(evaluated_value, bytes):
+        return None
+
+    return statement
+
+
+class DocstringCollector(cst.CSTVisitor):
+    """A visitor class for collecting docstrings from a CST.
+
+    Attributes:
+        stack: A list to keep track of the current path in the CST.
+        docstrings: A dictionary mapping paths in the CST to their corresponding docstrings.
+    """
+    def __init__(self):
+        self.stack: list[str] = []
+        self.docstrings: dict[tuple[str, ...], cst.SimpleStatementLine] = {}
+
+    def visit_Module(self, node: cst.Module) -> bool | None:
+        self.stack.append("")
+
+    def leave_Module(self, node: cst.Module) -> None:
+        return self._leave(node)
+
+    def visit_ClassDef(self, node: cst.ClassDef) -> bool | None:
+        self.stack.append(node.name.value)
+
+    def leave_ClassDef(self, node: cst.ClassDef) -> None:
+        return self._leave(node)
+
+    def visit_FunctionDef(self, node: cst.FunctionDef) -> bool | None:
+        self.stack.append(node.name.value)
+
+    def leave_FunctionDef(self, node: cst.FunctionDef) -> None:
+        return self._leave(node)
+
+    def _leave(self, node: DocstringNode) -> None:
+        key = tuple(self.stack)
+        self.stack.pop()
+        if hasattr(node, "decorators") and any(i.decorator.value == "overload" for i in node.decorators):
+            return
+
+        statement = get_docstring_statement(node)
+        if statement:
+            self.docstrings[key] = statement
+
+
+class DocstringTransformer(cst.CSTTransformer):
+    """A transformer class for replacing docstrings in a CST.
+
+    Attributes:
+        stack: A list to keep track of the current path in the CST.
+        docstrings: A dictionary mapping paths in the CST to their corresponding docstrings.
+    """
+    def __init__(
+        self,
+        docstrings: dict[tuple[str, ...], cst.SimpleStatementLine],
+    ):
+        self.stack: list[str] = []
+        self.docstrings = docstrings
+
+    def visit_Module(self, node: cst.Module) -> bool | None:
+        self.stack.append("")
+
+    def leave_Module(self, original_node: Module, updated_node: Module) -> Module:
+        return self._leave(original_node, updated_node)
+
+    def visit_ClassDef(self, node: cst.ClassDef) -> bool | None:
+        self.stack.append(node.name.value)
+
+    def leave_ClassDef(self, original_node: cst.ClassDef, updated_node: cst.ClassDef) -> cst.CSTNode:
+        return self._leave(original_node, updated_node)
+
+    def visit_FunctionDef(self, node: cst.FunctionDef) -> bool | None:
+        self.stack.append(node.name.value)
+
+    def leave_FunctionDef(self, original_node: cst.FunctionDef, updated_node: cst.FunctionDef) -> cst.CSTNode:
+        return self._leave(original_node, updated_node)
+
+    def _leave(self, original_node: DocstringNode, updated_node: DocstringNode) -> DocstringNode:
+        key = tuple(self.stack)
+        self.stack.pop()
+
+        if hasattr(updated_node, "decorators") and any((i.decorator.value == "overload") for i in updated_node.decorators):
+            return updated_node
+
+        statement = self.docstrings.get(key)
+        if not statement:
+            return updated_node
+
+        original_statement = get_docstring_statement(original_node)
+
+        if isinstance(updated_node, cst.Module):
+            body = updated_node.body
+            if original_statement:
+                return updated_node.with_changes(body=(statement, *body[1:]))
+            else:
+                updated_node = updated_node.with_changes(body=(statement, cst.EmptyLine(), *body))
+                return updated_node
+
+        body = updated_node.body.body[1:] if original_statement else updated_node.body.body
+        return updated_node.with_changes(body=updated_node.body.with_changes(body=(statement, *body)))
+
+
+def merge_docstring(code: str, documented_code: str) -> str:
+    """Merges the docstrings from the documented code into the original code.
+
+    Args:
+        code: The original code.
+        documented_code: The documented code.
+
+    Returns:
+        The original code with the docstrings from the documented code.
+    """
+    code_tree = cst.parse_module(code)
+    documented_code_tree = cst.parse_module(documented_code)
+
+    visitor = DocstringCollector()
+    documented_code_tree.visit(visitor)
+    transformer = DocstringTransformer(visitor.docstrings)
+    modified_tree = code_tree.visit(transformer)
+    return modified_tree.code

requirements.txt

@@ -35,4 +35,6 @@ tqdm==4.64.0
 anthropic==0.3.6
 typing-inspect==0.8.0
 typing_extensions==4.5.0
-aiofiles
+aiofiles
+libcst==1.0.1
+

tests/metagpt/actions/test_write_docstring.py

@@ -0,0 +1,32 @@
+import pytest
+
+from metagpt.actions.write_docstring import WriteDocstring
+
+code = '''
+def add_numbers(a: int, b: int):
+    return a + b
+
+
+class Person:
+    def __init__(self, name: str, age: int):
+        self.name = name
+        self.age = age
+
+    def greet(self):
+        return f"Hello, my name is {self.name} and I am {self.age} years old."
+'''
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    ("style", "part"),
+    [
+        ("google", "Args:"),
+        ("numpy", "Parameters"),
+        ("sphinx", ":param name:"),
+    ],
+    ids=["google", "numpy", "sphinx"]
+)
+async def test_write_docstring(style: str, part: str):
+    ret = await WriteDocstring().run(code, style=style)
+    assert part in ret

tests/metagpt/utils/test_output_parser.py

@@ -19,7 +19,7 @@ def test_parse_blocks():
 
 
 def test_parse_code():
-    test_text = "```python\nprint('Hello, world!')\n```"
+    test_text = "```python\nprint('Hello, world!')```"
     expected_result = "print('Hello, world!')"
     assert OutputParser.parse_code(test_text, 'python') == expected_result
 
@@ -27,6 +27,22 @@ def test_parse_code():
         OutputParser.parse_code(test_text, 'java')
 
 
+def test_parse_python_code():
+    expected_result = "print('Hello, world!')"
+    assert OutputParser.parse_python_code("```python\nprint('Hello, world!')```") == expected_result
+    assert OutputParser.parse_python_code("```python\nprint('Hello, world!')") == expected_result
+    assert OutputParser.parse_python_code("print('Hello, world!')") == expected_result
+    assert OutputParser.parse_python_code("print('Hello, world!')```") == expected_result
+    assert OutputParser.parse_python_code("print('Hello, world!')```") == expected_result
+    expected_result = "print('```Hello, world!```')"
+    assert OutputParser.parse_python_code("```python\nprint('```Hello, world!```')```") == expected_result
+    assert OutputParser.parse_python_code("The code is: ```python\nprint('```Hello, world!```')```") == expected_result
+    assert OutputParser.parse_python_code("xxx.\n```python\nprint('```Hello, world!```')```\nxxx") == expected_result
+
+    with pytest.raises(ValueError):
+        OutputParser.parse_python_code("xxx =")
+
+
 def test_parse_str():
     test_text = "name = 'Alice'"
     expected_result = 'Alice'

tests/metagpt/utils/test_pycst.py

@@ -0,0 +1,136 @@
+from metagpt.utils import pycst
+
+code = '''
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+from typing import overload
+
+@overload
+def add_numbers(a: int, b: int):
+    ...
+
+@overload
+def add_numbers(a: float, b: float):
+    ...
+
+def add_numbers(a: int, b: int):
+    return a + b
+
+
+class Person:
+    def __init__(self, name: str, age: int):
+        self.name = name
+        self.age = age
+
+    def greet(self):
+        return f"Hello, my name is {self.name} and I am {self.age} years old."
+'''
+
+documented_code = '''
+"""
+This is an example module containing a function and a class definition.
+"""
+
+
+def add_numbers(a: int, b: int):
+    """This function is used to add two numbers and return the result.
+
+    Parameters:
+        a: The first integer.
+        b: The second integer.
+
+    Returns:
+        int: The sum of the two numbers.
+    """
+    return a + b
+
+class Person:
+    """This class represents a person's information, including name and age.
+
+    Attributes:
+        name: The person's name.
+        age: The person's age.
+    """
+
+    def __init__(self, name: str, age: int):
+        """Creates a new instance of the Person class.
+
+        Parameters:
+            name: The person's name.
+            age: The person's age.
+        """
+        ...
+
+    def greet(self):
+        """
+        Returns a greeting message including the name and age.
+
+        Returns:
+            str: The greeting message.
+        """
+        ...
+'''
+
+
+merged_code = '''
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+This is an example module containing a function and a class definition.
+"""
+
+from typing import overload
+
+@overload
+def add_numbers(a: int, b: int):
+    ...
+
+@overload
+def add_numbers(a: float, b: float):
+    ...
+
+def add_numbers(a: int, b: int):
+    """This function is used to add two numbers and return the result.
+
+    Parameters:
+        a: The first integer.
+        b: The second integer.
+
+    Returns:
+        int: The sum of the two numbers.
+    """
+    return a + b
+
+
+class Person:
+    """This class represents a person's information, including name and age.
+
+    Attributes:
+        name: The person's name.
+        age: The person's age.
+    """
+    def __init__(self, name: str, age: int):
+        """Creates a new instance of the Person class.
+
+        Parameters:
+            name: The person's name.
+            age: The person's age.
+        """
+        self.name = name
+        self.age = age
+
+    def greet(self):
+        """
+        Returns a greeting message including the name and age.
+
+        Returns:
+            str: The greeting message.
+        """
+        return f"Hello, my name is {self.name} and I am {self.age} years old."
+'''
+
+
+def test_merge_docstring():
+    data = pycst.merge_docstring(code, documented_code)
+    print(data)
+    assert data == merged_code