PyPI - service-forge - Versions diffs - 0.1.28__py3-none-any.whl → 0.1.39__py3-none-any.whl - Mend

service-forge 0.1.28py3-none-any.whl → 0.1.39py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of service-forge might be problematic. Click here for more details.

Files changed (72) hide show

service_forge/frontend/static/index.html ADDED Viewed

@@ -0,0 +1,16 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8" />
+  <link rel="icon" type="image/svg+xml" href="./vite.svg" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>vite-project</title>
+  <script type="module" crossorigin src="./assets/index-BMvodlwc.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/vue-core-DL-LgTX0.js">
+  <link rel="modulepreload" crossorigin href="./assets/ui-components-DQ7-U3pr.js">
+  <link rel="stylesheet" crossorigin href="./assets/index-CjSe8i2q.css">
+</head>
+<body>
+<div id="app"></div>
+</body>
+</html>

service_forge/frontend/static/vite.svg ADDED Viewed

@@ -0,0 +1 @@

+ <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>

service_forge/model/meta_api/__init__.py ADDED Viewed

File without changes

service_forge/model/meta_api/schema.py ADDED Viewed

@@ -0,0 +1,29 @@
+from typing import Literal, Optional
+from pydantic import BaseModel
+class NodeInputPortSchema(BaseModel):
+    """
+    节点的输入端口定义数据
+    """
+    name: str
+    type: str
+    default_value: Optional[str | float | bool | int] = None
+class NodeOutputPortSchema(BaseModel):
+    """
+    节点的输出端口定义数据
+    """
+    name: str
+    type: str
+class NodeTypeSchema(BaseModel):
+    """
+    节点的定义数据
+    """
+    name: str
+    is_trigger: bool
+    inputs: dict[str, NodeInputPortSchema]
+    outputs: dict[str, NodeOutputPortSchema]

service_forge/model/trace.py ADDED Viewed

@@ -0,0 +1,82 @@
+from pydantic import BaseModel
+from typing import Optional, List, Dict, Any
+from enum import IntEnum
+# Type aliases
+TraceId = str
+SpanId = str
+ParentSpanId = str
+# Enums
+class SpanKind(IntEnum):
+    INTERNAL = 0
+    SERVER = 1
+    CLIENT = 2
+    PRODUCER = 3
+    CONSUMER = 4
+    UNKNOWN = 5
+class StatusCode(IntEnum):
+    UNSET = 0
+    OK = 1
+    ERROR = 2
+# Models
+class Span(BaseModel):
+    span_id: SpanId
+    parent_span_id: ParentSpanId
+    name: str
+    kind: SpanKind
+    timestamp: str
+    duration_nano: int
+    status_code: StatusCode
+    service_name: str
+    workflow_name: Optional[str] = None
+    workflow_task_id: Optional[str] = None
+    node_name: Optional[str] = None
+    attributes: Optional[Dict[str, Any]] = None
+class TraceListItem(BaseModel):
+    trace_id: TraceId
+    service_name: str
+    workflow_name: Optional[str] = None
+    workflow_task_id: Optional[str] = None
+    timestamp: str
+    duration_nano: int
+    span_count: int
+    has_error: bool
+    status_code: StatusCode
+class TraceDetail(BaseModel):
+    trace_id: TraceId
+    service_name: str
+    workflow_name: Optional[str] = None
+    workflow_task_id: Optional[str] = None
+    spans: List[Span]
+    start_time: Optional[str] = None
+    end_time: Optional[str] = None
+    span_count: int
+    has_error: bool
+class GetTraceListParams(BaseModel):
+    service_name: Optional[str] = None
+    workflow_name: Optional[str] = None
+    workflow_task_id: Optional[str] = None
+    start_time: Optional[str] = None
+    end_time: Optional[str] = None
+    limit: Optional[int] = None
+    offset: Optional[int] = None
+    has_error: Optional[bool] = None
+class GetTraceListResponse(BaseModel):
+    traces: List[TraceListItem]
+    total: int
+    limit: int
+    offset: int
+class GetTraceDetailParams(BaseModel):
+    trace_id: TraceId
+    service_name: Optional[str] = None
+class GetTraceDetailResponse(BaseModel):
+    trace: TraceDetail

service_forge/service.py CHANGED Viewed

@@ -1,9 +1,12 @@
 from __future__ import annotations
 import os
+import uuid
 import asyncio
 import threading
-import uuid
+from loguru import logger
+from service_forge.telemetry import setup_tracing
 from importlib.metadata import version
 from loguru import logger
 from typing import Callable, AsyncIterator, Awaitable, Any, TYPE_CHECKING
@@ -58,6 +61,7 @@ class Service:
         return self.metadata.description
     async def start(self):
+        setup_tracing(service_name=self.name, config=self.config.trace)
         set_service(self)
         if self.config.enable_http:
@@ -79,7 +83,7 @@ class Service:
             workflow_group = create_workflow_group(
                 config_path=self.parse_workflow_path(workflow_config_path),
                 service_env=self.service_env,
-                _handle_stream_output=self._handle_stream_output,
+                _handle_stream_output=self._handle_stream_output,
                 _handle_query_user=self._handle_query_user,
                 database_manager=self.database_manager,
             )
@@ -140,23 +144,23 @@ class Service:
     def get_workflow_group_by_id(self, workflow_id: str, allow_none: bool = True) -> WorkflowGroup | None:
         for workflow_group in self.workflow_groups:
-            if workflow_group.get_workflow_by_id(workflow_id) is not None:
+            if workflow_group.get_workflow_by_id(uuid.UUID(workflow_id)) is not None:
                 return workflow_group
         if not allow_none:
             raise ValueError(f"Workflow group with id {workflow_id} not found in service {self.name}")
         return None
-    def trigger_workflow(self, workflow_group: WorkflowGroup, trigger_name: str, **kwargs) -> uuid.UUID:
+    def trigger_workflow(self, workflow_group: WorkflowGroup, trigger_name: str, assigned_task_id: uuid.UUID | None, **kwargs) -> uuid.UUID:
         workflow = workflow_group.get_main_workflow(allow_none=False)
-        return workflow.trigger(trigger_name, **kwargs)
+        return workflow.trigger(trigger_name, assigned_task_id, **kwargs)
-    def trigger_workflow_by_name(self, workflow_name: str, workflow_version: str, trigger_name: str, **kwargs) -> uuid.UUID:
+    def trigger_workflow_by_name(self, workflow_name: str, workflow_version: str, trigger_name: str, assigned_task_id: uuid.UUID | None, **kwargs) -> uuid.UUID:
         workflow_group = self.get_workflow_group_by_name(workflow_name, workflow_version, allow_none=False)
-        return self.trigger_workflow(workflow_group, trigger_name, **kwargs)
+        return self.trigger_workflow(workflow_group, trigger_name, assigned_task_id, **kwargs)
-    def trigger_workflow_by_id(self, workflow_id: str, trigger_name: str, **kwargs) -> uuid.UUID:
+    def trigger_workflow_by_id(self, workflow_id: str, trigger_name: str, assigned_task_id: uuid.UUID | None, **kwargs) -> uuid.UUID:
         workflow_group = self.get_workflow_group_by_id(workflow_id, allow_none=False)
-        return self.trigger_workflow(workflow_group, trigger_name, **kwargs)
+        return self.trigger_workflow(workflow_group, trigger_name, assigned_task_id, **kwargs)
     def start_workflow(self, workflow_group: WorkflowGroup) -> bool:
         workflow = workflow_group.get_main_workflow(allow_none=False)
@@ -208,7 +212,7 @@ class Service:
         workflow_group = self.get_workflow_group_by_id(workflow_id, allow_none=False)
         return await self.stop_workflow(workflow_group)
-    async def load_workflow_from_config(self, config_path: str = None, config: dict = None) -> uuid.UUID:
+    async def load_workflow_from_config(self, config_path: str = None, config: dict = None, debug_version: bool = False) -> uuid.UUID:
         workflow_group = create_workflow_group(
             config_path=config_path,
             config=config,
@@ -216,6 +220,7 @@ class Service:
             _handle_stream_output=self._handle_stream_output,
             _handle_query_user=self._handle_query_user,
             database_manager=self.database_manager,
+            debug_version=debug_version,
         )
         for workflow in workflow_group.workflows:
@@ -232,10 +237,12 @@ class Service:
         self.start_workflow(workflow_group)
         return main_workflow.id
-    def get_service_status(self) -> dict[str, Any]:
+    def get_service_status(self, exclude_debug: bool = False) -> dict[str, Any]:
         workflow_statuses = []
         for workflow_group in self.workflow_groups:
             for workflow in workflow_group.workflows:
+                if exclude_debug and workflow.debug_version:
+                    continue
                 workflow_id = workflow.id
                 workflow_version = workflow.version
                 workflow_config = workflow.config
@@ -258,6 +265,20 @@ class Service:
             "description": self.description,
             "workflows": workflow_statuses,
         }
+    def get_workflow_status(self, workflow_id: str) -> dict[str, Any]:
+        workflow_group = self.get_workflow_group_by_id(workflow_id, allow_none=False)
+        main_workflow = workflow_group.get_workflow_by_id(uuid.UUID(workflow_id))
+        is_running = workflow_id in self.workflow_tasks and not self.workflow_tasks[workflow_id].done()
+        return {
+            "name": main_workflow.name,
+            "id": main_workflow.id,
+            "version": main_workflow.version,
+            "config": main_workflow.config,
+            "description": main_workflow.description,
+            "status": "running" if is_running else "stopped",
+            "debug": main_workflow.debug_version or False
+        }
     @staticmethod
     def from_config(metadata: SfMetadata, service_env: dict[str, Any] = None, config: ServiceConfig = None) -> Service:

service_forge/service_config.py CHANGED Viewed

@@ -7,6 +7,10 @@ class ServiceFeedbackConfig(BaseModel):
     api_url: str
     api_timeout: int = 5
+class SignozConfig(BaseModel):
+    api_url: str
+    api_key: str
 class ServiceDatabaseConfig(BaseModel):
     name: str
     postgres_user: str | None = None
@@ -25,6 +29,14 @@ class ServiceDatabaseConfig(BaseModel):
     redis_port: int | None = None
     redis_password: str | None = None
+class TraceConfig(BaseModel):
+    enable: bool = False
+    url: str | None = None
+    headers: str | None = None
+    arg: float | None = None
+    namespace: str | None = None
+    hostname: str | None = None
 class ServiceConfig(BaseModel):
     name: str
     workflows: list[str]
@@ -36,6 +48,8 @@ class ServiceConfig(BaseModel):
     kafka_port: int | None = None
     databases: list[ServiceDatabaseConfig] | None = None
     feedback: ServiceFeedbackConfig | None = None
+    signoz: SignozConfig | None = None
+    trace: TraceConfig | None = None
     @classmethod
     def from_yaml_file(cls, filepath: str) -> ServiceConfig:

service_forge/sft/config/injector.py CHANGED Viewed

@@ -2,9 +2,9 @@ import yaml
 from pathlib import Path
 from service_forge.sft.util.logger import log_info, log_error
 from service_forge.sft.config.injector_default_files import *
-from service_forge.sft.config.sf_metadata import load_metadata
+from service_forge.sft.config.sf_metadata import load_metadata, save_metadata
 from service_forge.sft.config.sft_config import sft_config
-from service_forge.service_config import ServiceConfig, ServiceFeedbackConfig
+from service_forge.service_config import ServiceConfig, ServiceFeedbackConfig, SignozConfig, TraceConfig
 from service_forge.sft.util.name_util import get_service_name
 from service_forge.sft.util.yaml_utils import load_sf_metadata_as_string
@@ -18,6 +18,7 @@ class Injector:
         self.pyproject_toml_path = project_dir / "pyproject.toml"
         self.start_sh_path = project_dir / "start.sh"
         self.metadata = load_metadata(self.metadata_path)
+        self.metadata.mode = "release"
         self.name = self.metadata.name
         self.version = self.metadata.version
         self.namespace = sft_config.k8s_namespace
@@ -94,6 +95,32 @@ class Injector:
                 api_timeout=sft_config.inject_feedback_api_timeout,
             )
+        if config.signoz is not None:
+            config.signoz.api_url = sft_config.inject_signoz_api_url
+            config.signoz.api_key = sft_config.inject_signoz_api_key
+        else:
+            config.signoz = SignozConfig(
+                api_url=sft_config.inject_signoz_api_url,
+                api_key=sft_config.inject_signoz_api_key,
+            )
+        if config.trace is not None:
+            config.trace.enable = True
+            config.trace.url = sft_config.inject_trace_url
+            config.trace.headers = sft_config.inject_trace_headers
+            config.trace.arg = sft_config.inject_trace_arg
+            config.trace.namespace = sft_config.inject_trace_namespace
+            config.trace.hostname = sft_config.inject_trace_hostname
+        else:
+            config.trace = TraceConfig(
+                enable=True,
+                url=sft_config.inject_trace_url,
+                headers=sft_config.inject_trace_headers,
+                arg=sft_config.inject_trace_arg,
+                namespace=sft_config.inject_trace_namespace,
+                hostname=sft_config.inject_trace_hostname,
+            )
         with open(service_config_path, "w", encoding="utf-8") as f:
             yaml.dump(config.model_dump(), f, allow_unicode=True, indent=2)
@@ -133,6 +160,8 @@ class Injector:
                 f.write(new_content)
     def inject(self) -> None:
+        if self.metadata.inject.pyproject_toml:
+            self.inject_pyproject_toml()
         if self.metadata.inject.deployment:
             self.inject_deployment()
         if self.metadata.inject.service_config:
@@ -144,3 +173,4 @@ class Injector:
         if self.metadata.inject.pyproject_toml:
             self.inject_pyproject_toml()
         self.clear_start_sh()
+        save_metadata(self.metadata, self.metadata_path)

service_forge/sft/config/injector_default_files.py CHANGED Viewed

@@ -65,6 +65,18 @@ spec:
   entryPoints:
     - web
   routes:
+    - match: PathPrefix(`/api/v1/{name}-{version}/sdk`)
+      kind: Rule
+      services:
+        - name: sf-{name}-{version}v
+          namespace: {namespace}
+          port: 80
+      middlewares:
+        - name: strip-prefix-sf-{name}-{version}v
+          namespace: {namespace}
+        - name: cors
+          namespace: {namespace}
     - match: PathPrefix(`/api/v1/{name}-{version}/openapi.json`)
       kind: Rule
       services:

service_forge/sft/config/sf_metadata.py CHANGED Viewed

@@ -18,6 +18,7 @@ class SfMetadata(BaseModel):
     env: list[dict]
     inject: SfMetadataInject = SfMetadataInject()
     enable_auth_middleware: bool = True
+    mode: str = "debug"
     @classmethod
     def from_yaml_file(cls, filepath: str) -> SfMetadata:
@@ -27,3 +28,7 @@ class SfMetadata(BaseModel):
 def load_metadata(path: str) -> SfMetadata:
     return SfMetadata.from_yaml_file(path)
+def save_metadata(meta: SfMetadata, path: str) -> None:
+    with open(path, 'w', encoding='utf-8') as f:
+        yaml.safe_dump(meta.model_dump(), f, allow_unicode=True)

service_forge/sft/config/sft_config.py CHANGED Viewed

@@ -57,6 +57,15 @@ class SftConfig:
         inject_feedback_api_url: str = "http://vps.shiweinan.com:37919/api/v1/feedback",
         inject_feedback_api_timeout: int = 5,
+        inject_signoz_api_url: str = "http://signoz.vps.shiweinan.com:37919",
+        inject_signoz_api_key: str = "JlxvqRtNFu5yc4o1bRcJyzeolA96iWzAyQnBePRRJd0=",
+        inject_trace_url: str = "http://traces.vps.shiweinan.com:37919/v1/traces",
+        inject_trace_headers: str = "",
+        inject_trace_arg: float = 1.0,
+        inject_trace_namespace: str = "secondbrain",
+        inject_trace_hostname: str = "",
         deepseek_api_key: str = "82c9df22-f6ed-411e-90d7-c5255376b7ca",
         deepseek_base_url: str = "https://ark.cn-beijing.volces.com/api/v3",
     ):
@@ -88,6 +97,15 @@ class SftConfig:
         self.inject_feedback_api_url = inject_feedback_api_url
         self.inject_feedback_api_timeout = inject_feedback_api_timeout
+        self.inject_signoz_api_url = inject_signoz_api_url
+        self.inject_signoz_api_key = inject_signoz_api_key
+        self.inject_trace_url = inject_trace_url
+        self.inject_trace_headers = inject_trace_headers
+        self.inject_trace_arg = inject_trace_arg
+        self.inject_trace_namespace = inject_trace_namespace
+        self.inject_trace_hostname = inject_trace_hostname
         self.deepseek_api_key = deepseek_api_key
         self.deepseek_base_url = deepseek_base_url

service_forge/telemetry.py ADDED Viewed

@@ -0,0 +1,66 @@
+from __future__ import annotations
+from typing import Optional
+from loguru import logger
+from opentelemetry import trace
+from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
+from opentelemetry.sdk.resources import Resource
+from opentelemetry.sdk.trace import TracerProvider
+from opentelemetry.sdk.trace.export import BatchSpanProcessor
+from opentelemetry.sdk.trace.sampling import ParentBased, TraceIdRatioBased
+from service_forge.service_config import TraceConfig
+_initialized = False
+def _parse_headers(raw: Optional[str]) -> dict[str, str]:
+    if not raw:
+        return {}
+    headers: dict[str, str] = {}
+    for part in raw.split(","):
+        if "=" in part:
+            key, value = part.split("=", 1)
+            headers[key.strip()] = value.strip()
+    return headers
+def setup_tracing(service_name: Optional[str] = None, config: TraceConfig = None) -> None:
+    """Initialize a global tracer provider with OTLP exporter if not already configured."""
+    if config is None or not config.enable:
+        return
+    global _initialized
+    if _initialized:
+        return
+    service_name = service_name or "service_forge_service"
+    endpoint = config.url
+    headers = _parse_headers(config.headers)
+    sampler_arg = config.arg or 1.0
+    try:
+        ratio = float(sampler_arg)
+    except ValueError:
+        ratio = 1.0
+    sampler = ParentBased(TraceIdRatioBased(ratio))
+    resource = Resource.create(
+        {
+            "service.name": service_name,
+            "service.namespace": config.namespace or "secondbrain",
+            "service.instance.id": config.hostname or "",
+        }
+    )
+    try:
+        provider = TracerProvider(resource=resource, sampler=sampler)
+        exporter = OTLPSpanExporter(endpoint=endpoint, headers=headers)
+        processor = BatchSpanProcessor(exporter)
+        provider.add_span_processor(processor)
+        trace.set_tracer_provider(provider)
+        _initialized = True
+        logger.info(
+            f"Tracing initialized: endpoint={endpoint}, service={service_name}, ratio={ratio}"
+        )
+    except Exception as exc:
+        logger.warning(f"Tracing initialization failed: {exc}")

service-forge 0.1.28__py3-none-any.whl → 0.1.39__py3-none-any.whl

Potentially problematic release.

service-forge 0.1.28py3-none-any.whl → 0.1.39py3-none-any.whl