Compare commits
3 Commits
c3e06c997f
...
e1c9a985ca
| Author | SHA1 | Date | |
|---|---|---|---|
| e1c9a985ca | |||
| 2996920277 | |||
| 1f18d2ec87 |
+6
-1
@@ -23,7 +23,12 @@ WECHAT_HOST=0.0.0.0
|
||||
|
||||
# 定时任务
|
||||
SCHEDULER_ENABLED=true
|
||||
SCHEDULER_CRON=0 8,14,18 * * *
|
||||
SCHEDULER_CRON=0 8-21 * * *
|
||||
|
||||
# LogHive 日志系统
|
||||
LOGHIVE_ENDPOINT=http://10.10.10.14:8000
|
||||
LOGHIVE_PROJECT=gx-gp-notify
|
||||
LOGHIVE_API_KEY=
|
||||
|
||||
# Markdown
|
||||
MARKDOWN_ENABLED=true
|
||||
|
||||
@@ -12,3 +12,5 @@ dist/
|
||||
config.yaml
|
||||
gx_gp_monitor/config/config.yaml
|
||||
onu.md
|
||||
vendor/build/
|
||||
vendor/*.egg-info/
|
||||
|
||||
@@ -2,6 +2,7 @@ import asyncio
|
||||
from alembic import context
|
||||
from sqlalchemy.ext.asyncio import create_async_engine
|
||||
from app.models.announcement import Base
|
||||
from app.models.holiday import ChineseHoliday # noqa: F401
|
||||
from app.config import settings
|
||||
|
||||
target_metadata = Base.metadata
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
"""add_chinese_holidays_table
|
||||
|
||||
Revision ID: 1f59799a5083
|
||||
Revises: eed20ee8cc26
|
||||
Create Date: 2026-05-09 18:14:31.144256
|
||||
|
||||
"""
|
||||
from typing import Sequence, Union
|
||||
|
||||
from alembic import op
|
||||
import sqlalchemy as sa
|
||||
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision: str = '1f59799a5083'
|
||||
down_revision: Union[str, Sequence[str], None] = 'eed20ee8cc26'
|
||||
branch_labels: Union[str, Sequence[str], None] = None
|
||||
depends_on: Union[str, Sequence[str], None] = None
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
"""Upgrade schema."""
|
||||
op.create_table(
|
||||
'chinese_holidays',
|
||||
sa.Column('date', sa.Date(), nullable=False),
|
||||
sa.Column('is_workday', sa.Boolean(), nullable=False, server_default='true'),
|
||||
sa.Column('year', sa.Integer(), nullable=False),
|
||||
sa.Column('description', sa.String(length=100), nullable=False, server_default=''),
|
||||
sa.PrimaryKeyConstraint('date'),
|
||||
)
|
||||
op.create_index('idx_chinese_holidays_year', 'chinese_holidays', ['year'])
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
"""Downgrade schema."""
|
||||
op.drop_index('idx_chinese_holidays_year', table_name='chinese_holidays')
|
||||
op.drop_table('chinese_holidays')
|
||||
@@ -0,0 +1,30 @@
|
||||
from fastapi import APIRouter, Depends, Query
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from app.api.deps import get_db
|
||||
from app.services.holiday_service import now_in_china, sync_holidays
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
|
||||
@router.post("/holidays/sync")
|
||||
async def sync_holidays_endpoint(
|
||||
year: int | None = Query(None, description="同步年份,默认当前年份"),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
):
|
||||
if year is None:
|
||||
year = now_in_china().year
|
||||
count = await sync_holidays(db, year)
|
||||
return {"status": "ok", "year": year, "synced": count}
|
||||
|
||||
|
||||
@router.get("/holidays/today")
|
||||
async def get_today_status(db: AsyncSession = Depends(get_db)):
|
||||
from app.services.holiday_service import is_workday
|
||||
today = now_in_china()
|
||||
workday = await is_workday(db, today)
|
||||
return {
|
||||
"date": today.isoformat(),
|
||||
"is_workday": workday,
|
||||
"message": "工作日,正常爬取" if workday else "非工作日,跳过爬取",
|
||||
}
|
||||
+2
-1
@@ -1,10 +1,11 @@
|
||||
from fastapi import APIRouter
|
||||
|
||||
from app.api import announcements, crawl, wechat
|
||||
from app.api import announcements, crawl, holidays, wechat
|
||||
from app.api import scheduler as scheduler_module
|
||||
|
||||
api_router = APIRouter(prefix="/api/v1")
|
||||
api_router.include_router(announcements.router, tags=["announcements"])
|
||||
api_router.include_router(crawl.router, tags=["crawl"])
|
||||
api_router.include_router(holidays.router, tags=["holidays"])
|
||||
api_router.include_router(wechat.router, tags=["wechat"])
|
||||
api_router.include_router(scheduler_module.router)
|
||||
|
||||
+2
-2
@@ -52,7 +52,7 @@ async def wechat_callback(request: Request):
|
||||
event = xml_tree.find("Event")
|
||||
event_key = xml_tree.find("EventKey")
|
||||
from_user = xml_tree.find("FromUserName")
|
||||
handler.handle_event(
|
||||
await handler.handle_event(
|
||||
event.text if event is not None else "",
|
||||
event_key.text if event_key is not None else None,
|
||||
from_user.text if from_user is not None else "",
|
||||
@@ -60,7 +60,7 @@ async def wechat_callback(request: Request):
|
||||
elif msg_type == "text":
|
||||
content = xml_tree.find("Content")
|
||||
from_user = xml_tree.find("FromUserName")
|
||||
handler.handle_text(
|
||||
await handler.handle_text(
|
||||
content.text if content is not None else "",
|
||||
from_user.text if from_user is not None else "",
|
||||
)
|
||||
|
||||
+6
-1
@@ -31,7 +31,12 @@ class Settings(BaseSettings):
|
||||
|
||||
# 定时任务
|
||||
scheduler_enabled: bool = True
|
||||
scheduler_cron: str = "0 8,14,18 * * *"
|
||||
scheduler_cron: str = "0 8-21 * * *"
|
||||
|
||||
# LogHive 日志系统
|
||||
loghive_endpoint: str = "http://10.10.10.14:8000"
|
||||
loghive_project: str = "gx-gp-notify"
|
||||
loghive_api_key: str = ""
|
||||
|
||||
# Markdown
|
||||
markdown_enabled: bool = True
|
||||
|
||||
+11
@@ -22,6 +22,17 @@ async def lifespan(app: FastAPI):
|
||||
level=getattr(logging, settings.log_level),
|
||||
format="%(asctime)s [%(levelname)s] %(name)s: %(message)s",
|
||||
)
|
||||
# LogHive 远程日志(仅当配置了 API Key 时启用)
|
||||
if settings.loghive_api_key:
|
||||
from loghive_client import LogHiveHandler
|
||||
handler = LogHiveHandler(
|
||||
project=settings.loghive_project,
|
||||
api_key=settings.loghive_api_key,
|
||||
endpoint=settings.loghive_endpoint,
|
||||
level=logging.INFO,
|
||||
)
|
||||
logging.getLogger().addHandler(handler)
|
||||
logging.info("LogHive 日志系统已连接")
|
||||
from app.scheduler.jobs import shutdown_scheduler, start_scheduler
|
||||
start_scheduler()
|
||||
yield
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
from datetime import date
|
||||
|
||||
from sqlalchemy import Boolean, Date, Integer, String
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from app.models.announcement import Base
|
||||
|
||||
|
||||
class ChineseHoliday(Base):
|
||||
__tablename__ = "chinese_holidays"
|
||||
|
||||
date: Mapped[date] = mapped_column(Date, primary_key=True)
|
||||
is_workday: Mapped[bool] = mapped_column(Boolean, nullable=False, default=True)
|
||||
year: Mapped[int] = mapped_column(Integer, nullable=False, index=True)
|
||||
description: Mapped[str] = mapped_column(String(100), nullable=False, default="")
|
||||
+21
-8
@@ -1,30 +1,43 @@
|
||||
import logging
|
||||
from datetime import datetime, time
|
||||
from datetime import datetime
|
||||
from zoneinfo import ZoneInfo
|
||||
|
||||
from apscheduler.schedulers.asyncio import AsyncIOScheduler
|
||||
from apscheduler.triggers.cron import CronTrigger
|
||||
|
||||
from app.api.deps import get_crawl_service
|
||||
from app.api.deps import get_db, get_crawl_service
|
||||
from app.config import settings
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
scheduler = AsyncIOScheduler()
|
||||
|
||||
NIGHT_START = time(22, 0)
|
||||
NIGHT_END = time(6, 0)
|
||||
NIGHT_START = 22 # 22:00
|
||||
NIGHT_END = 8 # 08:00
|
||||
TZ = ZoneInfo("Asia/Shanghai")
|
||||
|
||||
|
||||
def _is_night_time() -> bool:
|
||||
"""22:00 ~ 次日 06:00 夜间时段"""
|
||||
current = datetime.now(TZ).time()
|
||||
"""22:00 ~ 次日 08:00 夜间时段"""
|
||||
current = datetime.now(TZ).hour
|
||||
return current >= NIGHT_START or current < NIGHT_END
|
||||
|
||||
|
||||
async def scheduled_crawl():
|
||||
async def _should_skip() -> bool:
|
||||
"""检查是否应该跳过爬取"""
|
||||
if _is_night_time():
|
||||
logger.info("夜间时段 (22:00-06:00),跳过爬取")
|
||||
logger.info("夜间时段 (22:00-08:00),跳过爬取")
|
||||
return True
|
||||
|
||||
from app.services.holiday_service import is_workday
|
||||
async for db in get_db():
|
||||
if not await is_workday(db):
|
||||
logger.info("非工作日,跳过爬取")
|
||||
return True
|
||||
return False
|
||||
|
||||
|
||||
async def scheduled_crawl():
|
||||
if await _should_skip():
|
||||
return
|
||||
|
||||
logger.info("开始定时爬取任务")
|
||||
|
||||
@@ -0,0 +1,101 @@
|
||||
import logging
|
||||
from datetime import date
|
||||
|
||||
import httpx
|
||||
from sqlalchemy.dialects.postgresql import insert as pg_insert
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from app.models.holiday import ChineseHoliday
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
HOLIDAY_API = "http://timor.tech/api/holiday/year"
|
||||
|
||||
|
||||
def now_in_china() -> date:
|
||||
from datetime import datetime
|
||||
from zoneinfo import ZoneInfo
|
||||
return datetime.now(ZoneInfo("Asia/Shanghai")).date()
|
||||
|
||||
|
||||
async def sync_holidays(db: AsyncSession, year: int) -> int:
|
||||
"""同步中国节假日数据,返回更新的记录数"""
|
||||
url = f"{HOLIDAY_API}/{year}"
|
||||
async with httpx.AsyncClient(timeout=15) as client:
|
||||
response = await client.get(url)
|
||||
data = response.json()
|
||||
|
||||
if data.get("code") != 0:
|
||||
logger.error(f"节假日 API 返回错误: {data}")
|
||||
return 0
|
||||
|
||||
holidays = data.get("holiday", {})
|
||||
if not holidays:
|
||||
return 0
|
||||
|
||||
# 也标记周末(周六日但非调休工作日)
|
||||
from datetime import timedelta
|
||||
current = date(year, 1, 1)
|
||||
end = date(year, 12, 31)
|
||||
|
||||
records: dict[date, dict] = {}
|
||||
while current <= end:
|
||||
dow = current.weekday() # 0=Mon, 6=Sun
|
||||
# 默认:周一~五为工作日,周六日为非工作日
|
||||
default_workday = dow < 5
|
||||
records[current] = {
|
||||
"date": current,
|
||||
"is_workday": default_workday,
|
||||
"year": year,
|
||||
"description": "",
|
||||
}
|
||||
current += timedelta(days=1)
|
||||
|
||||
# 覆盖节假日数据
|
||||
# holiday=true → 休息日(无论 wage 值)
|
||||
# holiday=false → 调休补班日(周末也要上班)
|
||||
for date_str, info_str in holidays.items():
|
||||
d = date.fromisoformat(f"{year}-{date_str}")
|
||||
if d.year != year:
|
||||
continue
|
||||
info = info_str if isinstance(info_str, dict) else {}
|
||||
holiday = info.get("holiday", False)
|
||||
name = info.get("name", "")
|
||||
|
||||
records[d]["description"] = name
|
||||
records[d]["is_workday"] = not holiday # holiday=false → 调休工作日
|
||||
|
||||
# Upsert
|
||||
values = list(records.values())
|
||||
stmt = pg_insert(ChineseHoliday).values(values)
|
||||
stmt = stmt.on_conflict_do_update(
|
||||
index_elements=["date"],
|
||||
set_={"is_workday": stmt.excluded.is_workday,
|
||||
"description": stmt.excluded.description},
|
||||
)
|
||||
result = await db.execute(stmt)
|
||||
await db.commit()
|
||||
logger.info(f"已同步 {year} 年节假日,{len(values)} 天")
|
||||
return result.rowcount
|
||||
|
||||
|
||||
async def is_workday(db: AsyncSession, day: date | None = None) -> bool:
|
||||
"""判断某天是否为工作日"""
|
||||
if day is None:
|
||||
day = now_in_china()
|
||||
from sqlalchemy import select
|
||||
result = await db.execute(
|
||||
select(ChineseHoliday.is_workday).where(ChineseHoliday.date == day)
|
||||
)
|
||||
row = result.fetchone()
|
||||
if row is None:
|
||||
# 无数据时,按周判断
|
||||
return day.weekday() < 5
|
||||
return row[0]
|
||||
|
||||
|
||||
async def was_yesterday_workday(db: AsyncSession) -> bool:
|
||||
"""昨天是工作日吗"""
|
||||
from datetime import timedelta
|
||||
yesterday = now_in_china() - timedelta(days=1)
|
||||
return await is_workday(db, yesterday)
|
||||
+83
-2
@@ -1,7 +1,11 @@
|
||||
import logging
|
||||
import xml.etree.ElementTree as ET
|
||||
|
||||
from app.config import settings
|
||||
from app.wechat.crypto import WXBizMsgCrypt
|
||||
from app.wechat.client import WeChatClient
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class WeChatMessageHandler:
|
||||
@@ -11,6 +15,7 @@ class WeChatMessageHandler:
|
||||
sEncodingAESKey=settings.wechat_encoding_aes_key,
|
||||
sReceiveId=settings.wechat_corp_id,
|
||||
)
|
||||
self.client = WeChatClient()
|
||||
|
||||
def verify_url(
|
||||
self, msg_signature: str, timestamp: str, nonce: str, echostr: str
|
||||
@@ -48,10 +53,86 @@ class WeChatMessageHandler:
|
||||
return encrypted
|
||||
return None
|
||||
|
||||
def handle_event(
|
||||
async def handle_event(
|
||||
self, event: str, event_key: str | None, from_user: str
|
||||
) -> str | None:
|
||||
if event != "click" or not event_key:
|
||||
return None
|
||||
|
||||
def handle_text(self, content: str, from_user: str) -> str | None:
|
||||
if event_key == "today_stats":
|
||||
return await self._handle_today_stats(from_user)
|
||||
elif event_key == "trigger_crawl":
|
||||
return await self._handle_trigger_crawl(from_user)
|
||||
elif event_key == "sync_holidays":
|
||||
return await self._handle_sync_holidays(from_user)
|
||||
return None
|
||||
|
||||
async def handle_text(self, content: str, from_user: str) -> str | None:
|
||||
return None
|
||||
|
||||
async def _handle_today_stats(self, from_user: str) -> str | None:
|
||||
from app.api.deps import get_db
|
||||
|
||||
try:
|
||||
async for db in get_db():
|
||||
from sqlalchemy import func, select
|
||||
from app.models.announcement import Announcement
|
||||
|
||||
total_result = await db.execute(
|
||||
select(func.count()).select_from(Announcement)
|
||||
)
|
||||
total = total_result.scalar() or 0
|
||||
|
||||
today_result = await db.execute(
|
||||
select(func.count()).where(
|
||||
func.date(Announcement.publish_date) == func.current_date()
|
||||
).select_from(Announcement)
|
||||
)
|
||||
today = today_result.scalar() or 0
|
||||
|
||||
text = f"今日新增: {today} 条\n累计公告: {total} 条"
|
||||
await self.client.send_text(text, from_user)
|
||||
except Exception as e:
|
||||
logger.error(f"查询统计失败: {e}")
|
||||
await self.client.send_text("查询失败,请稍后再试", from_user)
|
||||
|
||||
async def _handle_trigger_crawl(self, from_user: str) -> str | None:
|
||||
from app.api.deps import get_crawl_service
|
||||
|
||||
await self.client.send_text("开始爬取,请稍候...", from_user)
|
||||
|
||||
try:
|
||||
service = get_crawl_service()
|
||||
results = await service.run_all()
|
||||
total = sum(r.total_count for r in results)
|
||||
stored = sum(
|
||||
r.pipeline_result.stored for r in results
|
||||
if r.pipeline_result
|
||||
)
|
||||
notified = sum(
|
||||
r.pipeline_result.notified for r in results
|
||||
if r.pipeline_result
|
||||
)
|
||||
errors = [r.error_message for r in results if not r.success]
|
||||
msg = f"爬取完成\n抓取: {total} 条\n新增: {stored} 条\n推送: {notified} 条"
|
||||
if errors:
|
||||
msg += f"\n异常: {errors[0][:50]}"
|
||||
await self.client.send_text(msg, from_user)
|
||||
except Exception as e:
|
||||
logger.error(f"手动爬取失败: {e}")
|
||||
await self.client.send_text(f"爬取失败: {e}", from_user)
|
||||
|
||||
async def _handle_sync_holidays(self, from_user: str) -> str | None:
|
||||
from app.services.holiday_service import now_in_china, sync_holidays
|
||||
from app.api.deps import get_db
|
||||
|
||||
try:
|
||||
async for db in get_db():
|
||||
year = now_in_china().year
|
||||
count = await sync_holidays(db, year)
|
||||
await self.client.send_text(
|
||||
f"已同步 {year} 年节假日\n共 {count} 条记录", from_user,
|
||||
)
|
||||
except Exception as e:
|
||||
logger.error(f"同步节假日失败: {e}")
|
||||
await self.client.send_text(f"同步失败: {e}", from_user)
|
||||
|
||||
@@ -0,0 +1,87 @@
|
||||
import logging
|
||||
|
||||
import httpx
|
||||
|
||||
from app.config import settings
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
MENU = {
|
||||
"button": [
|
||||
{
|
||||
"name": "今日公告",
|
||||
"type": "click",
|
||||
"key": "today_stats",
|
||||
},
|
||||
{
|
||||
"name": "系统管理",
|
||||
"sub_button": [
|
||||
{
|
||||
"name": "立即爬取",
|
||||
"type": "click",
|
||||
"key": "trigger_crawl",
|
||||
},
|
||||
{
|
||||
"name": "同步节假日",
|
||||
"type": "click",
|
||||
"key": "sync_holidays",
|
||||
},
|
||||
],
|
||||
},
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
class MenuManager:
|
||||
def __init__(self, client=None):
|
||||
self.client = client
|
||||
|
||||
async def _get_token(self) -> str | None:
|
||||
from app.wechat.client import WeChatClient
|
||||
c = self.client or WeChatClient()
|
||||
return await c._get_access_token()
|
||||
|
||||
async def create(self) -> bool:
|
||||
token = await self._get_token()
|
||||
if not token:
|
||||
return False
|
||||
|
||||
url = "https://qyapi.weixin.qq.com/cgi-bin/menu/create"
|
||||
params = {"access_token": token, "agentid": int(settings.wechat_agent_id)}
|
||||
|
||||
async with httpx.AsyncClient(timeout=15) as client:
|
||||
response = await client.post(url, params=params, json=MENU)
|
||||
data = response.json()
|
||||
if data.get("errcode") == 0:
|
||||
logger.info("企微菜单创建成功")
|
||||
return True
|
||||
logger.error(f"企微菜单创建失败: {data}")
|
||||
return False
|
||||
|
||||
async def delete(self) -> bool:
|
||||
token = await self._get_token()
|
||||
if not token:
|
||||
return False
|
||||
|
||||
url = "https://qyapi.weixin.qq.com/cgi-bin/menu/delete"
|
||||
params = {"access_token": token, "agentid": int(settings.wechat_agent_id)}
|
||||
|
||||
async with httpx.AsyncClient(timeout=15) as client:
|
||||
response = await client.get(url, params=params)
|
||||
data = response.json()
|
||||
return data.get("errcode") == 0
|
||||
|
||||
async def get(self) -> dict | None:
|
||||
token = await self._get_token()
|
||||
if not token:
|
||||
return None
|
||||
|
||||
url = "https://qyapi.weixin.qq.com/cgi-bin/menu/get"
|
||||
params = {"access_token": token, "agentid": int(settings.wechat_agent_id)}
|
||||
|
||||
async with httpx.AsyncClient(timeout=15) as client:
|
||||
response = await client.get(url, params=params)
|
||||
data = response.json()
|
||||
if data.get("errcode") == 0:
|
||||
return data
|
||||
return None
|
||||
+2
-1
@@ -7,7 +7,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
COPY pyproject.toml .
|
||||
RUN pip install --no-cache-dir -e ".[dev]"
|
||||
COPY vendor/ vendor/
|
||||
RUN pip install --no-cache-dir -e ".[dev]" && pip install --no-cache-dir ./vendor/
|
||||
|
||||
COPY . .
|
||||
|
||||
|
||||
Vendored
+84
@@ -0,0 +1,84 @@
|
||||
# LogHive Client SDK
|
||||
|
||||
Python client SDK for sending logs to [LogHive](https://github.com/your-org/loghive).
|
||||
|
||||
## Installation
|
||||
|
||||
```bash
|
||||
pip install loghive-client
|
||||
```
|
||||
|
||||
Or install from source:
|
||||
|
||||
```bash
|
||||
cd client
|
||||
pip install .
|
||||
```
|
||||
|
||||
## Quick Start
|
||||
|
||||
### Sync mode (recommended for scripts, Django, Flask)
|
||||
|
||||
```python
|
||||
from loghive_client import LogHiveLogger
|
||||
|
||||
logger = LogHiveLogger(
|
||||
project="my-awesome-app",
|
||||
api_key="your-api-key",
|
||||
endpoint="http://localhost:8000",
|
||||
)
|
||||
|
||||
logger.info("Server started", extra={"port": 8080})
|
||||
logger.error("Database timeout", exc_info=True)
|
||||
```
|
||||
|
||||
### Async mode (for FastAPI, aiohttp, asyncio)
|
||||
|
||||
```python
|
||||
from loghive_client import AsyncLogHiveLogger
|
||||
import asyncio
|
||||
|
||||
async def main():
|
||||
async with AsyncLogHiveLogger(
|
||||
project="my-api",
|
||||
api_key="your-api-key",
|
||||
endpoint="http://localhost:8000",
|
||||
) as logger:
|
||||
await logger.info("API started")
|
||||
# ...
|
||||
|
||||
asyncio.run(main())
|
||||
```
|
||||
|
||||
### Standard logging integration (zero code change)
|
||||
|
||||
Add the handler to your existing logger:
|
||||
|
||||
```python
|
||||
import logging
|
||||
from loghive_client import LogHiveHandler
|
||||
|
||||
handler = LogHiveHandler("my-project", "api-key", "http://localhost:8000")
|
||||
logging.getLogger().addHandler(handler)
|
||||
|
||||
# All existing logger calls now forward to LogHive
|
||||
logging.info("This goes to LogHive too!")
|
||||
```
|
||||
|
||||
## Configuration
|
||||
|
||||
| Param | Default | Description |
|
||||
|-------|---------|-------------|
|
||||
| `project` | (required) | Your project name in LogHive |
|
||||
| `api_key` | (required) | Your project's API key |
|
||||
| `endpoint` | `http://localhost:8000` | LogHive server URL |
|
||||
| `batch_size` | 50 | Max entries per HTTP request |
|
||||
| `flush_interval` | 2.0 | Seconds between flushes |
|
||||
| `max_retries` | 3 | Retries on failure |
|
||||
| `timeout` | 5.0 | HTTP request timeout |
|
||||
|
||||
## Trace ID (request correlation)
|
||||
|
||||
```python
|
||||
logger.set_trace_id("req-abc-123")
|
||||
```
|
||||
Vendored
+20
@@ -0,0 +1,20 @@
|
||||
"""LogHive Client — Send logs from your Python projects to LogHive.
|
||||
|
||||
Usage:
|
||||
from loghive_client import LogHiveLogger
|
||||
|
||||
logger = LogHiveLogger(
|
||||
project="my-project",
|
||||
api_key="your-api-key",
|
||||
endpoint="http://localhost:8000",
|
||||
)
|
||||
|
||||
logger.info("User logged in", extra={"user_id": 42})
|
||||
logger.error("Database connection failed", exc_info=True)
|
||||
"""
|
||||
|
||||
from loghive_client.client import LogHiveLogger
|
||||
from loghive_client.async_client import AsyncLogHiveLogger
|
||||
from loghive_client.handler import LogHiveHandler
|
||||
|
||||
__all__ = ["LogHiveLogger", "AsyncLogHiveLogger", "LogHiveHandler"]
|
||||
+178
@@ -0,0 +1,178 @@
|
||||
"""Async LogHive client — for use in asyncio-based projects (e.g., FastAPI, aiohttp)."""
|
||||
|
||||
import asyncio
|
||||
import logging
|
||||
import traceback
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any, Dict, List, Optional
|
||||
from urllib.parse import urljoin
|
||||
|
||||
import httpx
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class AsyncLogHiveLogger:
|
||||
"""Async logger for asyncio applications.
|
||||
|
||||
Uses an async background task to batch and send log entries.
|
||||
Ideal for FastAPI / Starlette / aiohttp projects.
|
||||
|
||||
Usage:
|
||||
logger = AsyncLogHiveLogger("my-project", "api-key", "http://localhost:8000")
|
||||
await logger.start()
|
||||
|
||||
await logger.info("Request processed", extra={"path": "/api/users"})
|
||||
|
||||
await logger.stop()
|
||||
"""
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
project: str,
|
||||
api_key: str,
|
||||
endpoint: str = "http://localhost:8000",
|
||||
batch_size: int = 50,
|
||||
flush_interval: float = 2.0,
|
||||
max_retries: int = 3,
|
||||
timeout: float = 5.0,
|
||||
):
|
||||
self.project = project
|
||||
self.api_key = api_key
|
||||
self.endpoint = endpoint.rstrip("/")
|
||||
self.batch_size = batch_size
|
||||
self.flush_interval = flush_interval
|
||||
self.max_retries = max_retries
|
||||
self.timeout = timeout
|
||||
|
||||
self._queue: asyncio.Queue = asyncio.Queue()
|
||||
self._task: Optional[asyncio.Task] = None
|
||||
self._client: Optional[httpx.AsyncClient] = None
|
||||
self._stop_event = asyncio.Event()
|
||||
|
||||
async def start(self):
|
||||
"""Start the background flush task."""
|
||||
if self._task and not self._task.done():
|
||||
return
|
||||
self._client = httpx.AsyncClient(timeout=self.timeout)
|
||||
self._stop_event.clear()
|
||||
self._task = asyncio.create_task(self._flush_loop())
|
||||
logger.debug("AsyncLogHiveLogger started for project '%s'", self.project)
|
||||
|
||||
async def stop(self, flush: bool = True):
|
||||
"""Stop the background task."""
|
||||
self._stop_event.set()
|
||||
if flush:
|
||||
await self._flush_now()
|
||||
if self._task:
|
||||
self._task.cancel()
|
||||
try:
|
||||
await self._task
|
||||
except asyncio.CancelledError:
|
||||
pass
|
||||
if self._client:
|
||||
await self._client.aclose()
|
||||
logger.debug("AsyncLogHiveLogger stopped for project '%s'", self.project)
|
||||
|
||||
async def __aenter__(self):
|
||||
await self.start()
|
||||
return self
|
||||
|
||||
async def __aexit__(self, *args):
|
||||
await self.stop()
|
||||
|
||||
async def _flush_loop(self):
|
||||
"""Background loop that periodically flushes the queue."""
|
||||
while not self._stop_event.is_set():
|
||||
await self._flush_now()
|
||||
await asyncio.sleep(self.flush_interval)
|
||||
|
||||
async def _flush_now(self):
|
||||
"""Flush all currently queued entries."""
|
||||
entries = []
|
||||
while len(entries) < self.batch_size:
|
||||
try:
|
||||
entry = self._queue.get_nowait()
|
||||
entries.append(entry)
|
||||
except asyncio.QueueEmpty:
|
||||
break
|
||||
|
||||
if not entries:
|
||||
return
|
||||
|
||||
await self._send_batch(entries)
|
||||
|
||||
async def _send_batch(self, entries: List[Dict[str, Any]]):
|
||||
"""Send a batch with retries."""
|
||||
url = urljoin(self.endpoint, "/api/logs/ingest")
|
||||
payload = {"project": self.project, "entries": entries}
|
||||
|
||||
for attempt in range(self.max_retries):
|
||||
try:
|
||||
resp = await self._client.post(
|
||||
url,
|
||||
json=payload,
|
||||
headers={"Authorization": f"Bearer {self.api_key}"},
|
||||
)
|
||||
if resp.status_code == 201:
|
||||
return
|
||||
elif resp.status_code == 401:
|
||||
logger.error("LogHive: Invalid API key — dropping batch")
|
||||
return
|
||||
else:
|
||||
logger.warning(
|
||||
"LogHive: HTTP %d (attempt %d/%d)",
|
||||
resp.status_code,
|
||||
attempt + 1,
|
||||
self.max_retries,
|
||||
)
|
||||
except httpx.RequestError as e:
|
||||
logger.warning(
|
||||
"LogHive: Connection error (attempt %d/%d): %s",
|
||||
attempt + 1,
|
||||
self.max_retries,
|
||||
e,
|
||||
)
|
||||
|
||||
if attempt < self.max_retries - 1:
|
||||
await asyncio.sleep(2 ** attempt)
|
||||
|
||||
logger.error("LogHive: Failed to send %d entries after %d retries", len(entries), self.max_retries)
|
||||
|
||||
def _enqueue(self, level: str, message: str, **kwargs):
|
||||
"""Enqueue a log entry."""
|
||||
entry = {
|
||||
"timestamp": datetime.now(timezone.utc).isoformat(),
|
||||
"level": level,
|
||||
"message": message,
|
||||
"logger": kwargs.pop("logger", None) or __name__,
|
||||
"extra": kwargs,
|
||||
}
|
||||
|
||||
exc_info = kwargs.pop("exc_info", None)
|
||||
if exc_info:
|
||||
if isinstance(exc_info, BaseException):
|
||||
entry["exception"] = "".join(
|
||||
traceback.format_exception(type(exc_info), exc_info, exc_info.__traceback__)
|
||||
)
|
||||
elif exc_info is True:
|
||||
entry["exception"] = traceback.format_exc()
|
||||
|
||||
self._queue.put_nowait(entry)
|
||||
|
||||
# ── Public API ─────────────────────────────────────────────
|
||||
|
||||
async def debug(self, message: str, **kwargs):
|
||||
self._enqueue("debug", message, **kwargs)
|
||||
|
||||
async def info(self, message: str, **kwargs):
|
||||
self._enqueue("info", message, **kwargs)
|
||||
|
||||
async def warning(self, message: str, **kwargs):
|
||||
self._enqueue("warning", message, **kwargs)
|
||||
|
||||
async def error(self, message: str, **kwargs):
|
||||
self._enqueue("error", message, **kwargs)
|
||||
|
||||
async def critical(self, message: str, **kwargs):
|
||||
self._enqueue("critical", message, **kwargs)
|
||||
Vendored
+183
@@ -0,0 +1,183 @@
|
||||
"""Synchronous LogHive client — uses threading for non-blocking sends."""
|
||||
|
||||
import json
|
||||
import logging
|
||||
import threading
|
||||
import time
|
||||
import traceback
|
||||
from datetime import datetime, timezone
|
||||
from queue import Queue, Empty
|
||||
from typing import Any, Dict, List, Optional
|
||||
from urllib.parse import urljoin
|
||||
|
||||
import httpx
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class LogHiveLogger:
|
||||
"""Synchronous logger that sends logs to LogHive in the background.
|
||||
|
||||
Uses a background thread with a queue to avoid blocking the main
|
||||
application on network I/O.
|
||||
|
||||
Usage:
|
||||
logger = LogHiveLogger("my-project", "api-key-here", "http://localhost:8000")
|
||||
logger.info("Hello, world!")
|
||||
logger.error("Something broke", exc_info=True)
|
||||
"""
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
project: str,
|
||||
api_key: str,
|
||||
endpoint: str = "http://localhost:8000",
|
||||
batch_size: int = 50,
|
||||
flush_interval: float = 2.0,
|
||||
max_retries: int = 3,
|
||||
timeout: float = 5.0,
|
||||
auto_start: bool = True,
|
||||
):
|
||||
self.project = project
|
||||
self.api_key = api_key
|
||||
self.endpoint = endpoint.rstrip("/")
|
||||
self.batch_size = batch_size
|
||||
self.flush_interval = flush_interval
|
||||
self.max_retries = max_retries
|
||||
self.timeout = timeout
|
||||
|
||||
self._queue: Queue = Queue()
|
||||
self._stop_event = threading.Event()
|
||||
self._thread: Optional[threading.Thread] = None
|
||||
|
||||
if auto_start:
|
||||
self.start()
|
||||
|
||||
def start(self):
|
||||
"""Start the background flush thread."""
|
||||
if self._thread and self._thread.is_alive():
|
||||
return
|
||||
self._stop_event.clear()
|
||||
self._thread = threading.Thread(target=self._flush_loop, daemon=True)
|
||||
self._thread.start()
|
||||
|
||||
def stop(self, flush: bool = True):
|
||||
"""Stop the background thread, optionally flushing remaining logs."""
|
||||
self._stop_event.set()
|
||||
if flush and self._thread:
|
||||
self._flush_now()
|
||||
if self._thread:
|
||||
self._thread.join(timeout=5)
|
||||
|
||||
def _flush_loop(self):
|
||||
"""Background loop that periodically flushes the queue."""
|
||||
while not self._stop_event.is_set():
|
||||
self._flush_now()
|
||||
self._stop_event.wait(self.flush_interval)
|
||||
|
||||
def _flush_now(self):
|
||||
"""Flush all currently queued log entries."""
|
||||
entries = []
|
||||
while len(entries) < self.batch_size:
|
||||
try:
|
||||
entry = self._queue.get_nowait()
|
||||
entries.append(entry)
|
||||
except Empty:
|
||||
break
|
||||
|
||||
if not entries:
|
||||
return
|
||||
|
||||
self._send_batch(entries)
|
||||
|
||||
def _send_batch(self, entries: List[Dict[str, Any]]):
|
||||
"""Send a batch of entries to the LogHive API, with retries."""
|
||||
url = urljoin(self.endpoint, "/api/logs/ingest")
|
||||
payload = {"project": self.project, "entries": entries}
|
||||
|
||||
for attempt in range(self.max_retries):
|
||||
try:
|
||||
resp = httpx.post(
|
||||
url,
|
||||
json=payload,
|
||||
headers={"Authorization": f"Bearer {self.api_key}"},
|
||||
timeout=self.timeout,
|
||||
)
|
||||
if resp.status_code == 201:
|
||||
return
|
||||
elif resp.status_code == 401:
|
||||
logger.error("LogHive: Invalid API key — dropping batch")
|
||||
return
|
||||
else:
|
||||
logger.warning(
|
||||
"LogHive: HTTP %d (attempt %d/%d)",
|
||||
resp.status_code,
|
||||
attempt + 1,
|
||||
self.max_retries,
|
||||
)
|
||||
except httpx.RequestError as e:
|
||||
logger.warning(
|
||||
"LogHive: Connection error (attempt %d/%d): %s",
|
||||
attempt + 1,
|
||||
self.max_retries,
|
||||
e,
|
||||
)
|
||||
|
||||
if attempt < self.max_retries - 1:
|
||||
time.sleep(2 ** attempt)
|
||||
|
||||
logger.error("LogHive: Failed to send %d entries after %d retries", len(entries), self.max_retries)
|
||||
|
||||
def _enqueue(self, level: str, message: str, **kwargs):
|
||||
"""Enqueue a log entry for async sending."""
|
||||
entry = {
|
||||
"timestamp": datetime.now(timezone.utc).isoformat(),
|
||||
"level": level,
|
||||
"message": message,
|
||||
"logger": kwargs.pop("logger", None) or __name__,
|
||||
"module": kwargs.pop("module", None),
|
||||
"function": kwargs.pop("function", None),
|
||||
"line_no": kwargs.pop("line_no", None),
|
||||
"trace_id": kwargs.pop("trace_id", None),
|
||||
"extra": kwargs,
|
||||
}
|
||||
|
||||
# Handle exception info
|
||||
exc_info = kwargs.pop("exc_info", None)
|
||||
if exc_info:
|
||||
if isinstance(exc_info, BaseException):
|
||||
entry["exception"] = "".join(
|
||||
traceback.format_exception(type(exc_info), exc_info, exc_info.__traceback__)
|
||||
)
|
||||
elif exc_info is True:
|
||||
entry["exception"] = traceback.format_exc()
|
||||
|
||||
self._queue.put_nowait(entry)
|
||||
|
||||
# ── Public API (matching standard logging levels) ──────────
|
||||
|
||||
def debug(self, message: str, **kwargs):
|
||||
self._enqueue("debug", message, **kwargs)
|
||||
|
||||
def info(self, message: str, **kwargs):
|
||||
self._enqueue("info", message, **kwargs)
|
||||
|
||||
def warning(self, message: str, **kwargs):
|
||||
self._enqueue("warning", message, **kwargs)
|
||||
|
||||
def error(self, message: str, **kwargs):
|
||||
self._enqueue("error", message, **kwargs)
|
||||
|
||||
def critical(self, message: str, **kwargs):
|
||||
self._enqueue("critical", message, **kwargs)
|
||||
|
||||
def log(self, level: str, message: str, **kwargs):
|
||||
"""Log a message with an explicit level string."""
|
||||
self._enqueue(level, message, **kwargs)
|
||||
|
||||
def set_trace_id(self, trace_id: str):
|
||||
"""Set a trace_id for request correlation (used in web frameworks)."""
|
||||
self._current_trace_id = trace_id
|
||||
|
||||
def __del__(self):
|
||||
self.stop(flush=True)
|
||||
Vendored
+72
@@ -0,0 +1,72 @@
|
||||
"""Python logging.Handler integration — use LogHive with the stdlib logging module.
|
||||
|
||||
This allows you to replace or augment your existing logging setup with
|
||||
zero code changes (just add a handler to your logger).
|
||||
"""
|
||||
|
||||
import logging
|
||||
from typing import Optional
|
||||
|
||||
from loghive_client.client import LogHiveLogger
|
||||
|
||||
|
||||
class LogHiveHandler(logging.Handler):
|
||||
"""A logging.Handler that sends records to LogHive.
|
||||
|
||||
Use it with Python's standard logging module:
|
||||
import logging
|
||||
from loghive_client import LogHiveHandler
|
||||
|
||||
handler = LogHiveHandler("my-project", "api-key", "http://localhost:8000")
|
||||
logging.getLogger().addHandler(handler)
|
||||
|
||||
All existing logger calls (logger.info, logger.error, etc.) will
|
||||
automatically forward to LogHive.
|
||||
"""
|
||||
|
||||
LEVEL_MAP = {
|
||||
logging.DEBUG: "debug",
|
||||
logging.INFO: "info",
|
||||
logging.WARNING: "warning",
|
||||
logging.ERROR: "error",
|
||||
logging.CRITICAL: "critical",
|
||||
}
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
project: str,
|
||||
api_key: str,
|
||||
endpoint: str = "http://localhost:8000",
|
||||
level: int = logging.INFO,
|
||||
):
|
||||
super().__init__(level=level)
|
||||
self._client = LogHiveLogger(
|
||||
project=project,
|
||||
api_key=api_key,
|
||||
endpoint=endpoint,
|
||||
)
|
||||
|
||||
def emit(self, record: logging.LogRecord):
|
||||
"""Send a log record to LogHive."""
|
||||
try:
|
||||
level = self.LEVEL_MAP.get(record.levelno, "info")
|
||||
extra = {
|
||||
"logger": record.name,
|
||||
"module": record.module,
|
||||
"function": record.funcName,
|
||||
"line_no": record.lineno,
|
||||
}
|
||||
if record.exc_info and record.exc_info[0]:
|
||||
import traceback
|
||||
extra["exception"] = "".join(
|
||||
traceback.format_exception(*record.exc_info)
|
||||
)
|
||||
|
||||
self._client._enqueue(level, record.getMessage(), **extra)
|
||||
except Exception:
|
||||
self.handleError(record)
|
||||
|
||||
def close(self):
|
||||
"""Flush and close."""
|
||||
self._client.stop(flush=True)
|
||||
super().close()
|
||||
Vendored
+23
@@ -0,0 +1,23 @@
|
||||
"""Setup script for loghive-client."""
|
||||
|
||||
from setuptools import setup, find_packages
|
||||
|
||||
setup(
|
||||
name="loghive-client",
|
||||
version="0.1.0",
|
||||
description="LogHive client SDK — push logs from your Python projects to LogHive",
|
||||
author="LogHive",
|
||||
packages=find_packages(),
|
||||
install_requires=[
|
||||
"httpx>=0.27.0",
|
||||
],
|
||||
python_requires=">=3.10",
|
||||
classifiers=[
|
||||
"Development Status :: 3 - Alpha",
|
||||
"Intended Audience :: Developers",
|
||||
"Programming Language :: Python :: 3",
|
||||
"Programming Language :: Python :: 3.10",
|
||||
"Programming Language :: Python :: 3.11",
|
||||
"Programming Language :: Python :: 3.12",
|
||||
],
|
||||
)
|
||||
Reference in New Issue
Block a user