reportify-cli 0.1.3__tar.gz → 0.1.4__tar.gz

{reportify_cli-0.1.3 → reportify_cli-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reportify-cli
-Version: 0.1.3
+Version: 0.1.4
 Summary: CLI wrapper for Reportify SDK - Access Reportify API through command line
 Project-URL: Homepage, https://reportify.ai
 Project-URL: Documentation, https://docs.reportify.ai

{reportify_cli-0.1.3 → reportify_cli-0.1.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "reportify-cli"
-version = "0.1.3"
+version = "0.1.4"
 description = "CLI wrapper for Reportify SDK - Access Reportify API through command line"
 readme = "README.md"
 requires-python = ">=3.10"

{reportify_cli-0.1.3 → reportify_cli-0.1.4}/scripts/bump_version.sh

@@ -13,7 +13,7 @@ NC='\033[0m' # No Color
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 PROJECT_DIR="$(dirname "$SCRIPT_DIR")"
 
-cd "$PROJECT_DIR"
+cd "$PROJECT_DIR/"
 
 echo -e "${BLUE}═══════════════════════════════════════════════${NC}"
 echo -e "${BLUE}   Reportify CLI - Version Bump Script${NC}"
@@ -65,11 +65,11 @@ echo -e "${GREEN}New version: ${NEW_VERSION}${NC}"
 echo ""
 
 # Confirm the change
-read -p "Bump version from ${CURRENT_VERSION} to ${NEW_VERSION}? (y/n): " CONFIRM
-if [ "$CONFIRM" != "y" ]; then
-    echo -e "${YELLOW}Version bump cancelled${NC}"
-    exit 0
-fi
+#read -p "Bump version from ${CURRENT_VERSION} to ${NEW_VERSION}? (y/n): " CONFIRM
+#if [ "$CONFIRM" != "y" ]; then
+#    echo -e "${YELLOW}Version bump cancelled${NC}"
+#    exit 0
+#fi
 
 # Update version in pyproject.toml
 echo -e "${BLUE}Updating pyproject.toml...${NC}"
@@ -89,19 +89,28 @@ git diff pyproject.toml
 echo ""
 
 # Ask if we should commit
-read -p "Commit this change? (y/n): " COMMIT
-if [ "$COMMIT" == "y" ]; then
+
+if [ -n "$(git status --porcelain)" ]; then
+    echo -e "${RED}提交版本修改记录"
+    # 配置git信息
+    git config --global user.name "GitLab Runner Bot"
+    git config --global user.email "gitlab-runner-arm@xiaobangtouzi.com"
+    git remote set-url origin "https://gitlab-ci-token:${GITLAB_PUSHER_TOKEN}@${CI_SERVER_HOST}/${CI_PROJECT_PATH}.git"
+    # 提交和推送代码逻辑
     git add pyproject.toml
-    git commit -m "chore: bump version to ${NEW_VERSION}"
+    git commit -am "chore: bump version to ${NEW_VERSION} [ci skip]"
     echo -e "${GREEN}✓ Changes committed${NC}"
     echo ""
+    git push origin -o ci.skip HEAD:${CI_COMMIT_REF_NAME}
+    echo -e "${GREEN}✓ Changes pushed to remote${NC}"
+fi
 
-    # Ask if we should push
-    read -p "Push to remote? (y/n): " PUSH
-    if [ "$PUSH" == "y" ]; then
-        git push
-        echo -e "${GREEN}✓ Changes pushed to remote${NC}"
-    fi
+if [ -n "$(git status --porcelain)" ]; then
+    echo -e "${RED}Error: You have uncommitted changes. Please commit or stash them first.${NC}"
+    git status --short
+    exit 1
+else
+    echo -e "${GREEN}✓ No uncommitted changes${NC}"
 fi
 
 echo ""

{reportify_cli-0.1.3 → reportify_cli-0.1.4}/scripts/publish.sh

@@ -51,14 +51,14 @@ fi
 echo ""
 
 # Step 1: Check for uncommitted changes
-echo -e "${BLUE}Step 1: Checking for uncommitted changes...${NC}"
-if [ -n "$(git status --porcelain)" ]; then
-    echo -e "${RED}Error: You have uncommitted changes. Please commit or stash them first.${NC}"
-    git status --short
-    exit 1
-fi
-echo -e "${GREEN}✓ No uncommitted changes${NC}"
-echo ""
+#echo -e "${BLUE}Step 1: Checking for uncommitted changes...${NC}"
+#if [ -n "$(git status --porcelain)" ]; then
+#    echo -e "${RED}Error: You have uncommitted changes. Please commit or stash them first.${NC}"
+#    git status --short
+#    exit 1
+#fi
+#echo -e "${GREEN}✓ No uncommitted changes${NC}"
+#echo ""
 
 # Step 2: Run tests
 # echo -e "${BLUE}Step 2: Running tests...${NC}"
@@ -131,12 +131,12 @@ fi
 
 # Publish
 if [ "$PUBLISH_TYPE" == "prod" ]; then
-    echo -e "${YELLOW}Publishing to PRODUCTION PyPI...${NC}"
-    read -p "Are you sure? Type 'y' to confirm: " CONFIRM
-    if [ "$CONFIRM" != "y" ]; then
-        echo -e "${YELLOW}Publish cancelled${NC}"
-        exit 1
-    fi
+#    echo -e "${YELLOW}Publishing to PRODUCTION PyPI...${NC}"
+#    read -p "Are you sure? Type 'y' to confirm: " CONFIRM
+#    if [ "$CONFIRM" != "y" ]; then
+#        echo -e "${YELLOW}Publish cancelled${NC}"
+#        exit 1
+#    fi
     uv publish
 else
     echo -e "${GREEN}Publishing to TEST PyPI...${NC}"
@@ -148,21 +148,21 @@ echo -e "${GREEN}✓ Package published successfully${NC}"
 echo ""
 
 # Step 8: Create git tag
-echo -e "${BLUE}Step 8: Creating git tag...${NC}"
-TAG="v${VERSION}"
-
-if git rev-parse "$TAG" >/dev/null 2>&1; then
-    echo -e "${YELLOW}Warning: Tag $TAG already exists${NC}"
-else
-    git tag -a "$TAG" -m "Release $VERSION"
-    echo -e "${GREEN}✓ Created tag: $TAG${NC}"
-
-    read -p "Push tag to remote? (y/n): " PUSH_TAG
-    if [ "$PUSH_TAG" == "y" ]; then
-        git push origin "$TAG"
-        echo -e "${GREEN}✓ Tag pushed to remote${NC}"
-    fi
-fi
+#cho -e "${BLUE}Step 8: Creating git tag...${NC}"
+#TAG="v${VERSION}"
+
+#if git rev-parse "$TAG" >/dev/null 2>&1; then
+#    echo -e "${YELLOW}Warning: Tag $TAG already exists${NC}"
+#else
+#    git tag -a "$TAG" -m "Release $VERSION"
+#    echo -e "${GREEN}✓ Created tag: $TAG${NC}"
+#
+#    read -p "Push tag to remote? (y/n): " PUSH_TAG
+#    if [ "$PUSH_TAG" == "y" ]; then
+#        git push origin "$TAG"
+#        echo -e "${GREEN}✓ Tag pushed to remote${NC}"
+#    fi
+#fi
 echo ""
 
 echo -e "${GREEN}═══════════════════════════════════════════════${NC}"

reportify_cli-0.1.4/src/commands/user.py

@@ -0,0 +1,339 @@
+"""User module commands."""
+
+from typing import Annotated
+
+import typer
+
+from src import params
+from src.client import get_client
+from src.output import format_output
+from src.utils import generate_epilog, parse_json_input
+
+app = typer.Typer(help="User data", rich_markup_mode="rich")
+
+
+@app.command(
+    name="followed_companies",
+    epilog=generate_epilog(
+        params.USER_FOLLOWED_COMPANIES_PARAMS, ["reportify-cli user followed_companies"]
+    ),
+)
+def followed_companies(
+    input: Annotated[str, typer.Option(help="JSON input parameters")] = "{}",
+    format: Annotated[str, typer.Option(help="Output format: json, table, csv")] = "json",
+):
+    """Get all followed companies"""
+    try:
+        params_dict = parse_json_input(input)
+        client = get_client()
+        result = client.user.followed_companies(**params_dict)
+        format_output(result, format)
+    except Exception as e:
+        typer.echo(f"Error: {e}", err=True)
+        raise typer.Exit(1)
+
+
+@app.command(
+    name="follow_company",
+    epilog=generate_epilog(
+        params.USER_FOLLOW_COMPANY_PARAMS,
+        [
+            'reportify-cli user follow_company --input \'{"symbol": "US:AAPL"}\'',
+            'reportify-cli user follow_company --input \'{"symbol": "HK:00700"}\'',
+            'reportify-cli user follow_company --input \'{"symbol": "SH:600519"}\'',
+            'reportify-cli user follow_company --input \'{"symbol": "SZ:000001"}\'',
+
+        ],
+    ),
+)
+def follow_company(
+    input: Annotated[str, typer.Option(help="JSON input parameters")] = "{}",
+    format: Annotated[str, typer.Option(help="Output format: json, table, csv")] = "json",
+):
+    """Follow a company (add to watchlist)"""
+    try:
+        params_dict = parse_json_input(input)
+        client = get_client()
+        symbol = params_dict.get("symbol")
+        if not symbol:
+            raise ValueError("symbol is required")
+        result = client.user.follow_company(symbol)
+        format_output(result, format)
+    except Exception as e:
+        typer.echo(f"Error: {e}", err=True)
+        raise typer.Exit(1)
+
+
+@app.command(
+    name="unfollow_company",
+    epilog=generate_epilog(
+        params.USER_UNFOLLOW_COMPANY_PARAMS,
+        [
+            'reportify-cli user unfollow_company --input \'{"symbol": "US:AAPL"}\'',
+            'reportify-cli user unfollow_company --input \'{"symbol": "HK:00700"}\'',
+        ],
+    ),
+)
+def unfollow_company(
+    input: Annotated[str, typer.Option(help="JSON input parameters")] = "{}",
+    format: Annotated[str, typer.Option(help="Output format: json, table, csv")] = "json",
+):
+    """Unfollow a company (remove from watchlist)"""
+    try:
+        params_dict = parse_json_input(input)
+        client = get_client()
+        symbol = params_dict.get("symbol")
+        if not symbol:
+            raise ValueError("symbol is required")
+        result = client.user.unfollow_company(symbol)
+        format_output(result, format)
+    except Exception as e:
+        typer.echo(f"Error: {e}", err=True)
+        raise typer.Exit(1)
+
+
+@app.command(
+    name="create_follow_group",
+    epilog=generate_epilog(
+        {},
+        [
+            'reportify-cli user create_follow_group --input \'{"name": "My Stocks", "follow_values": [{"follow_type": 1, "follow_value": "US:AAPL"}]}\'',
+        ],
+    ),
+)
+def create_follow_group(
+    input: Annotated[str, typer.Option(help="JSON input parameters")] = "{}",
+    format: Annotated[str, typer.Option(help="Output format: json, table, csv")] = "json",
+):
+    """Create a follow group"""
+    try:
+        params_dict = parse_json_input(input)
+        client = get_client()
+        name = params_dict.get("name")
+        if not name:
+            raise ValueError("name is required")
+        follow_values = params_dict.get("follow_values", [])
+        result = client.user.create_follow_group(name, follow_values)
+        format_output(result, format)
+    except Exception as e:
+        typer.echo(f"Error: {e}", err=True)
+        raise typer.Exit(1)
+
+
+@app.command(
+    name="get_follow_groups",
+    epilog=generate_epilog(
+        {},
+        [
+            'reportify-cli user get_follow_groups',
+        ],
+    ),
+)
+def get_follow_groups(
+    input: Annotated[str, typer.Option(help="JSON input parameters")] = "{}",
+    format: Annotated[str, typer.Option(help="Output format: json, table, csv")] = "json",
+):
+    """Get all follow groups"""
+    try:
+        params_dict = parse_json_input(input)
+        client = get_client()
+        result = client.user.get_follow_groups()
+        format_output(result, format)
+    except Exception as e:
+        typer.echo(f"Error: {e}", err=True)
+        raise typer.Exit(1)
+
+
+@app.command(
+    name="get_follow_group",
+    epilog=generate_epilog(
+        {},
+        [
+            'reportify-cli user get_follow_group --input \'{"group_id": "123"}\'',
+        ],
+    ),
+)
+def get_follow_group(
+    input: Annotated[str, typer.Option(help="JSON input parameters")] = "{}",
+    format: Annotated[str, typer.Option(help="Output format: json, table, csv")] = "json",
+):
+    """Get a follow group by ID"""
+    try:
+        params_dict = parse_json_input(input)
+        client = get_client()
+        group_id = params_dict.get("group_id")
+        if not group_id:
+            raise ValueError("group_id is required")
+        result = client.user.get_follow_group(group_id)
+        format_output(result, format)
+    except Exception as e:
+        typer.echo(f"Error: {e}", err=True)
+        raise typer.Exit(1)
+
+
+@app.command(
+    name="update_follow_group",
+    epilog=generate_epilog(
+        {},
+        [
+            'reportify-cli user update_follow_group --input \'{"group_id": "123", "name": "New Name"}\'',
+        ],
+    ),
+)
+def update_follow_group(
+    input: Annotated[str, typer.Option(help="JSON input parameters")] = "{}",
+    format: Annotated[str, typer.Option(help="Output format: json, table, csv")] = "json",
+):
+    """Update a follow group"""
+    try:
+        params_dict = parse_json_input(input)
+        client = get_client()
+        group_id = params_dict.get("group_id")
+        if not group_id:
+            raise ValueError("group_id is required")
+        name = params_dict.get("name")
+        result = client.user.update_follow_group(group_id, name)
+        format_output(result, format)
+    except Exception as e:
+        typer.echo(f"Error: {e}", err=True)
+        raise typer.Exit(1)
+
+
+@app.command(
+    name="delete_follow_group",
+    epilog=generate_epilog(
+        {},
+        [
+            'reportify-cli user delete_follow_group --input \'{"group_id": "123"}\'',
+        ],
+    ),
+)
+def delete_follow_group(
+    input: Annotated[str, typer.Option(help="JSON input parameters")] = "{}",
+    format: Annotated[str, typer.Option(help="Output format: json, table, csv")] = "json",
+):
+    """Delete a follow group"""
+    try:
+        params_dict = parse_json_input(input)
+        client = get_client()
+        group_id = params_dict.get("group_id")
+        if not group_id:
+            raise ValueError("group_id is required")
+        result = client.user.delete_follow_group(group_id)
+        format_output(result, format)
+    except Exception as e:
+        typer.echo(f"Error: {e}", err=True)
+        raise typer.Exit(1)
+
+
+@app.command(
+    name="add_follows_to_group",
+    epilog=generate_epilog(
+        {},
+        [
+            'reportify-cli user add_follows_to_group --input \'{"group_id": "123", "follow_values": [{"follow_type": 1, "follow_value": "US:TSLA"}]}\'',
+        ],
+    ),
+)
+def add_follows_to_group(
+    input: Annotated[str, typer.Option(help="JSON input parameters")] = "{}",
+    format: Annotated[str, typer.Option(help="Output format: json, table, csv")] = "json",
+):
+    """Add follows to a group"""
+    try:
+        params_dict = parse_json_input(input)
+        client = get_client()
+        group_id = params_dict.get("group_id")
+        if not group_id:
+            raise ValueError("group_id is required")
+        follow_values = params_dict.get("follow_values", [])
+        result = client.user.add_follows_to_group(group_id, follow_values)
+        format_output(result, format)
+    except Exception as e:
+        typer.echo(f"Error: {e}", err=True)
+        raise typer.Exit(1)
+
+
+@app.command(
+    name="remove_follows_from_group",
+    epilog=generate_epilog(
+        {},
+        [
+            'reportify-cli user remove_follows_from_group --input \'{"group_id": "123", "follow_ids": ["follow_1", "follow_2"]}\'',
+        ],
+    ),
+)
+def remove_follows_from_group(
+    input: Annotated[str, typer.Option(help="JSON input parameters")] = "{}",
+    format: Annotated[str, typer.Option(help="Output format: json, table, csv")] = "json",
+):
+    """Remove follows from a group"""
+    try:
+        params_dict = parse_json_input(input)
+        client = get_client()
+        group_id = params_dict.get("group_id")
+        if not group_id:
+            raise ValueError("group_id is required")
+        follow_ids = params_dict.get("follow_ids", [])
+        result = client.user.remove_follows_from_group(group_id, follow_ids)
+        format_output(result, format)
+    except Exception as e:
+        typer.echo(f"Error: {e}", err=True)
+        raise typer.Exit(1)
+
+
+@app.command(
+    name="set_group_follows",
+    epilog=generate_epilog(
+        {},
+        [
+            'reportify-cli user set_group_follows --input \'{"group_id": "123", "follow_values": [{"follow_type": 1, "follow_value": "US:AAPL"}]}\'',
+        ],
+    ),
+)
+def set_group_follows(
+    input: Annotated[str, typer.Option(help="JSON input parameters")] = "{}",
+    format: Annotated[str, typer.Option(help="Output format: json, table, csv")] = "json",
+):
+    """Set follows for a group (replace all)"""
+    try:
+        params_dict = parse_json_input(input)
+        client = get_client()
+        group_id = params_dict.get("group_id")
+        if not group_id:
+            raise ValueError("group_id is required")
+        follow_values = params_dict.get("follow_values", [])
+        result = client.user.set_group_follows(group_id, follow_values)
+        format_output(result, format)
+    except Exception as e:
+        typer.echo(f"Error: {e}", err=True)
+        raise typer.Exit(1)
+
+
+@app.command(
+    name="get_follow_group_reports",
+    epilog=generate_epilog(
+        {},
+        [
+            'reportify-cli user get_follow_group_reports --input \'{"group_id": "123", "page_num": 1, "page_size": 20}\'',
+        ],
+    ),
+)
+def get_follow_group_reports(
+    input: Annotated[str, typer.Option(help="JSON input parameters")] = "{}",
+    format: Annotated[str, typer.Option(help="Output format: json, table, csv")] = "json",
+):
+    """Get reports for a follow group"""
+    try:
+        params_dict = parse_json_input(input)
+        client = get_client()
+        group_id = params_dict.get("group_id")
+        if not group_id:
+            raise ValueError("group_id is required")
+        page_num = params_dict.get("page_num", 1)
+        page_size = params_dict.get("page_size", 10)
+        result = client.user.get_follow_group_reports(group_id, page_num, page_size)
+        format_output(result, format)
+    except Exception as e:
+        typer.echo(f"Error: {e}", err=True)
+        raise typer.Exit(1)

reportify_cli-0.1.3/src/commands/user.py

@@ -1,92 +0,0 @@
-"""User module commands."""
-
-from typing import Annotated
-
-import typer
-
-from src import params
-from src.client import get_client
-from src.output import format_output
-from src.utils import generate_epilog, parse_json_input
-
-app = typer.Typer(help="User data", rich_markup_mode="rich")
-
-
-@app.command(
-    name="followed_companies",
-    epilog=generate_epilog(
-        params.USER_FOLLOWED_COMPANIES_PARAMS, ["reportify-cli user followed_companies"]
-    ),
-)
-def followed_companies(
-    input: Annotated[str, typer.Option(help="JSON input parameters")] = "{}",
-    format: Annotated[str, typer.Option(help="Output format: json, table, csv")] = "json",
-):
-    """Get all followed companies"""
-    try:
-        params_dict = parse_json_input(input)
-        client = get_client()
-        result = client.user.followed_companies(**params_dict)
-        format_output(result, format)
-    except Exception as e:
-        typer.echo(f"Error: {e}", err=True)
-        raise typer.Exit(1)
-
-
-@app.command(
-    name="follow_company",
-    epilog=generate_epilog(
-        params.USER_FOLLOW_COMPANY_PARAMS,
-        [
-            'reportify-cli user follow_company --input \'{"symbol": "US:AAPL"}\'',
-            'reportify-cli user follow_company --input \'{"symbol": "HK:00700"}\'',
-            'reportify-cli user follow_company --input \'{"symbol": "SH:600519"}\'',
-            'reportify-cli user follow_company --input \'{"symbol": "SZ:000001"}\'',
-
-        ],
-    ),
-)
-def follow_company(
-    input: Annotated[str, typer.Option(help="JSON input parameters")] = "{}",
-    format: Annotated[str, typer.Option(help="Output format: json, table, csv")] = "json",
-):
-    """Follow a company (add to watchlist)"""
-    try:
-        params_dict = parse_json_input(input)
-        client = get_client()
-        symbol = params_dict.get("symbol")
-        if not symbol:
-            raise ValueError("symbol is required")
-        result = client.user.follow_company(symbol)
-        format_output(result, format)
-    except Exception as e:
-        typer.echo(f"Error: {e}", err=True)
-        raise typer.Exit(1)
-
-
-@app.command(
-    name="unfollow_company",
-    epilog=generate_epilog(
-        params.USER_UNFOLLOW_COMPANY_PARAMS,
-        [
-            'reportify-cli user unfollow_company --input \'{"symbol": "US:AAPL"}\'',
-            'reportify-cli user unfollow_company --input \'{"symbol": "HK:00700"}\'',
-        ],
-    ),
-)
-def unfollow_company(
-    input: Annotated[str, typer.Option(help="JSON input parameters")] = "{}",
-    format: Annotated[str, typer.Option(help="Output format: json, table, csv")] = "json",
-):
-    """Unfollow a company (remove from watchlist)"""
-    try:
-        params_dict = parse_json_input(input)
-        client = get_client()
-        symbol = params_dict.get("symbol")
-        if not symbol:
-            raise ValueError("symbol is required")
-        result = client.user.unfollow_company(symbol)
-        format_output(result, format)
-    except Exception as e:
-        typer.echo(f"Error: {e}", err=True)
-        raise typer.Exit(1)