unitysvc-services 0.2.0__py3-none-any.whl → 0.2.2__py3-none-any.whl

unitysvc_services/publisher.py

@@ -19,12 +19,19 @@ from .validator import DataValidator
 class ServiceDataPublisher:
     """Publishes service data to UnitySVC backend endpoints."""
 
-    def __init__(self, base_url: str, api_key: str):
-        self.base_url = base_url.rstrip("/")
-        self.api_key = api_key
+    def __init__(self) -> None:
+        self.base_url = os.environ.get("UNITYSVC_BASE_URL")
+        if not self.base_url:
+            raise ValueError("UNITYSVC_BASE_URL environment variable not set")
+
+        self.api_key = os.environ.get("UNITYSVC_API_KEY")
+        if not self.api_key:
+            raise ValueError("UNITYSVC_API_KEY environment variable not set")
+
+        self.base_url = self.base_url.rstrip("/")
         self.client = httpx.Client(
             headers={
-                "X-API-Key": api_key,
+                "X-API-Key": self.api_key,
                 "Content-Type": "application/json",
             },
             timeout=30.0,
@@ -573,29 +580,11 @@ def publish_callback(
         console.print(f"[red]✗[/red] Path not found: {data_path}", style="bold red")
         raise typer.Exit(code=1)
 
-    # Get backend URL from environment
-    backend_url = os.getenv("UNITYSVC_BASE_URL")
-    if not backend_url:
-        console.print(
-            "[red]✗[/red] UNITYSVC_BASE_URL environment variable not set.",
-            style="bold red",
-        )
-        raise typer.Exit(code=1)
-
-    # Get API key from environment
-    api_key = os.getenv("UNITYSVC_API_KEY")
-    if not api_key:
-        console.print(
-            "[red]✗[/red] UNITYSVC_API_KEY environment variable not set.",
-            style="bold red",
-        )
-        raise typer.Exit(code=1)
-
     console.print(f"[bold blue]Publishing all data from:[/bold blue] {data_path}")
-    console.print(f"[bold blue]Backend URL:[/bold blue] {backend_url}\n")
+    console.print(f"[bold blue]Backend URL:[/bold blue] {os.getenv('UNITYSVC_BASE_URL', 'N/A')}\n")
 
     try:
-        with ServiceDataPublisher(backend_url, api_key) as publisher:
+        with ServiceDataPublisher() as publisher:
             # Call the publish_all_models method
             all_results = publisher.publish_all_models(data_path)
 
@@ -678,37 +667,19 @@ def publish_providers(
         console.print(f"[red]✗[/red] Path not found: {data_path}", style="bold red")
         raise typer.Exit(code=1)
 
-    # Get backend URL from environment
-    backend_url = os.getenv("UNITYSVC_BASE_URL")
-    if not backend_url:
-        console.print(
-            "[red]✗[/red] UNITYSVC_BASE_URL environment variable not set.",
-            style="bold red",
-        )
-        raise typer.Exit(code=1)
-
-    # Get API key from environment
-    api_key = os.getenv("UNITYSVC_API_KEY")
-    if not api_key:
-        console.print(
-            "[red]✗[/red] UNITYSVC_API_KEY environment variable not set.",
-            style="bold red",
-        )
-        raise typer.Exit(code=1)
-
     try:
-        with ServiceDataPublisher(backend_url, api_key) as publisher:
+        with ServiceDataPublisher() as publisher:
             # Handle single file
             if data_path.is_file():
                 console.print(f"[blue]Publishing provider:[/blue] {data_path}")
-                console.print(f"[blue]Backend URL:[/blue] {backend_url}\n")
+                console.print(f"[blue]Backend URL:[/blue] {os.getenv('UNITYSVC_BASE_URL', 'N/A')}\n")
                 result = publisher.post_provider(data_path)
                 console.print("[green]✓[/green] Provider published successfully!")
                 console.print(f"[cyan]Response:[/cyan] {json.dumps(result, indent=2)}")
             # Handle directory
             else:
                 console.print(f"[blue]Scanning for providers in:[/blue] {data_path}")
-                console.print(f"[blue]Backend URL:[/blue] {backend_url}\n")
+                console.print(f"[blue]Backend URL:[/blue] {os.getenv('UNITYSVC_BASE_URL', 'N/A')}\n")
                 results = publisher.publish_all_providers(data_path)
 
                 # Display summary
@@ -755,37 +726,19 @@ def publish_sellers(
         console.print(f"[red]✗[/red] Path not found: {data_path}", style="bold red")
         raise typer.Exit(code=1)
 
-    # Get backend URL from environment
-    backend_url = os.getenv("UNITYSVC_BASE_URL")
-    if not backend_url:
-        console.print(
-            "[red]✗[/red] UNITYSVC_BASE_URL environment variable not set.",
-            style="bold red",
-        )
-        raise typer.Exit(code=1)
-
-    # Get API key from environment
-    api_key = os.getenv("UNITYSVC_API_KEY")
-    if not api_key:
-        console.print(
-            "[red]✗[/red] UNITYSVC_API_KEY environment variable not set.",
-            style="bold red",
-        )
-        raise typer.Exit(code=1)
-
     try:
-        with ServiceDataPublisher(backend_url, api_key) as publisher:
+        with ServiceDataPublisher() as publisher:
             # Handle single file
             if data_path.is_file():
                 console.print(f"[blue]Publishing seller:[/blue] {data_path}")
-                console.print(f"[blue]Backend URL:[/blue] {backend_url}\n")
+                console.print(f"[blue]Backend URL:[/blue] {os.getenv('UNITYSVC_BASE_URL', 'N/A')}\n")
                 result = publisher.post_seller(data_path)
                 console.print("[green]✓[/green] Seller published successfully!")
                 console.print(f"[cyan]Response:[/cyan] {json.dumps(result, indent=2)}")
             # Handle directory
             else:
                 console.print(f"[blue]Scanning for sellers in:[/blue] {data_path}")
-                console.print(f"[blue]Backend URL:[/blue] {backend_url}\n")
+                console.print(f"[blue]Backend URL:[/blue] {os.getenv('UNITYSVC_BASE_URL', 'N/A')}\n")
                 results = publisher.publish_all_sellers(data_path)
 
                 console.print("\n[bold]Publishing Summary:[/bold]")
@@ -830,37 +783,19 @@ def publish_offerings(
         console.print(f"[red]✗[/red] Path not found: {data_path}", style="bold red")
         raise typer.Exit(code=1)
 
-    # Get backend URL from environment
-    backend_url = os.getenv("UNITYSVC_BASE_URL")
-    if not backend_url:
-        console.print(
-            "[red]✗[/red] UNITYSVC_BASE_URL environment variable not set.",
-            style="bold red",
-        )
-        raise typer.Exit(code=1)
-
-    # Get API key from environment
-    api_key = os.getenv("UNITYSVC_API_KEY")
-    if not api_key:
-        console.print(
-            "[red]✗[/red] UNITYSVC_API_KEY environment variable not set.",
-            style="bold red",
-        )
-        raise typer.Exit(code=1)
-
     try:
-        with ServiceDataPublisher(backend_url, api_key) as publisher:
+        with ServiceDataPublisher() as publisher:
             # Handle single file
             if data_path.is_file():
                 console.print(f"[blue]Publishing service offering:[/blue] {data_path}")
-                console.print(f"[blue]Backend URL:[/blue] {backend_url}\n")
+                console.print(f"[blue]Backend URL:[/blue] {os.getenv('UNITYSVC_BASE_URL', 'N/A')}\n")
                 result = publisher.post_service_offering(data_path)
                 console.print("[green]✓[/green] Service offering published successfully!")
                 console.print(f"[cyan]Response:[/cyan] {json.dumps(result, indent=2)}")
             # Handle directory
             else:
                 console.print(f"[blue]Scanning for service offerings in:[/blue] {data_path}")
-                console.print(f"[blue]Backend URL:[/blue] {backend_url}\n")
+                console.print(f"[blue]Backend URL:[/blue] {os.getenv('UNITYSVC_BASE_URL', 'N/A')}\n")
                 results = publisher.publish_all_offerings(data_path)
 
                 console.print("\n[bold]Publishing Summary:[/bold]")
@@ -906,37 +841,19 @@ def publish_listings(
         console.print(f"[red]✗[/red] Path not found: {data_path}", style="bold red")
         raise typer.Exit(code=1)
 
-    # Get backend URL from environment
-    backend_url = os.getenv("UNITYSVC_BASE_URL")
-    if not backend_url:
-        console.print(
-            "[red]✗[/red] UNITYSVC_BASE_URL environment variable not set.",
-            style="bold red",
-        )
-        raise typer.Exit(code=1)
-
-    # Get API key from environment
-    api_key = os.getenv("UNITYSVC_API_KEY")
-    if not api_key:
-        console.print(
-            "[red]✗[/red] UNITYSVC_API_KEY environment variable not set.",
-            style="bold red",
-        )
-        raise typer.Exit(code=1)
-
     try:
-        with ServiceDataPublisher(backend_url, api_key) as publisher:
+        with ServiceDataPublisher() as publisher:
             # Handle single file
             if data_path.is_file():
                 console.print(f"[blue]Publishing service listing:[/blue] {data_path}")
-                console.print(f"[blue]Backend URL:[/blue] {backend_url}\n")
+                console.print(f"[blue]Backend URL:[/blue] {os.getenv('UNITYSVC_BASE_URL', 'N/A')}\n")
                 result = publisher.post_service_listing(data_path)
                 console.print("[green]✓[/green] Service listing published successfully!")
                 console.print(f"[cyan]Response:[/cyan] {json.dumps(result, indent=2)}")
             # Handle directory
             else:
                 console.print(f"[blue]Scanning for service listings in:[/blue] {data_path}")
-                console.print(f"[blue]Backend URL:[/blue] {backend_url}\n")
+                console.print(f"[blue]Backend URL:[/blue] {os.getenv('UNITYSVC_BASE_URL', 'N/A')}\n")
                 results = publisher.publish_all_listings(data_path)
 
                 console.print("\n[bold]Publishing Summary:[/bold]")

unitysvc_services/query.py

@@ -16,26 +16,24 @@ console = Console()
 class ServiceDataQuery:
     """Query service data from UnitySVC backend endpoints."""
 
-    def __init__(self, base_url: str, api_key: str):
-        """Initialize query client with backend URL and API key.
-
-        Args:
-            base_url: UnitySVC backend URL
-            api_key: API key for authentication
+    def __init__(self) -> None:
+        """Initialize query client from environment variables.
 
         Raises:
-            ValueError: If base_url or api_key is not provided
+            ValueError: If required environment variables are not set
         """
-        if not base_url:
-            raise ValueError("UNITYSVC_BASE_URL environment variable not set.")
-        if not api_key:
-            raise ValueError("UNITYSVC_API_KEY environment variable not set.")
+        self.base_url = os.environ.get("UNITYSVC_BASE_URL")
+        if not self.base_url:
+            raise ValueError("UNITYSVC_BASE_URL environment variable not set")
+
+        self.api_key = os.environ.get("UNITYSVC_API_KEY")
+        if not self.api_key:
+            raise ValueError("UNITYSVC_API_KEY environment variable not set")
 
-        self.base_url = base_url.rstrip("/")
-        self.api_key = api_key
+        self.base_url = self.base_url.rstrip("/")
         self.client = httpx.Client(
             headers={
-                "X-API-Key": api_key,
+                "X-API-Key": self.api_key,
                 "Content-Type": "application/json",
             },
             timeout=30.0,
@@ -93,20 +91,6 @@ class ServiceDataQuery:
         """Context manager exit."""
         self.close()
 
-    @staticmethod
-    def from_env() -> "ServiceDataQuery":
-        """Create ServiceDataQuery from environment variables.
-
-        Returns:
-            ServiceDataQuery instance
-
-        Raises:
-            ValueError: If required environment variables are not set
-        """
-        backend_url = os.getenv("UNITYSVC_BASE_URL") or ""
-        api_key = os.getenv("UNITYSVC_API_KEY") or ""
-        return ServiceDataQuery(base_url=backend_url, api_key=api_key)
-
 
 @app.command("sellers")
 def query_sellers(
@@ -119,7 +103,7 @@ def query_sellers(
 ):
     """Query all sellers from the backend."""
     try:
-        with ServiceDataQuery.from_env() as query:
+        with ServiceDataQuery() as query:
             sellers = query.list_sellers()
 
             if format == "json":
@@ -166,7 +150,7 @@ def query_providers(
 ):
     """Query all providers from the backend."""
     try:
-        with ServiceDataQuery.from_env() as query:
+        with ServiceDataQuery() as query:
             providers = query.list_providers()
 
             if format == "json":
@@ -209,7 +193,7 @@ def query_offerings(
 ):
     """Query all service offerings from UnitySVC backend."""
     try:
-        with ServiceDataQuery.from_env() as query:
+        with ServiceDataQuery() as query:
             offerings = query.list_service_offerings()
 
             if format == "json":
@@ -257,7 +241,7 @@ def query_listings(
 ):
     """Query all service listings from UnitySVC backend."""
     try:
-        with ServiceDataQuery.from_env() as query:
+        with ServiceDataQuery() as query:
             listings = query.list_service_listings()
 
             if format == "json":
@@ -304,7 +288,7 @@ def query_interfaces(
 ):
     """Query all access interfaces from UnitySVC backend (private endpoint)."""
     try:
-        with ServiceDataQuery.from_env() as query:
+        with ServiceDataQuery() as query:
             data = query.list_access_interfaces()
 
             if format == "json":
@@ -353,7 +337,7 @@ def query_documents(
 ):
     """Query all documents from UnitySVC backend (private endpoint)."""
     try:
-        with ServiceDataQuery.from_env() as query:
+        with ServiceDataQuery() as query:
             data = query.list_documents()
 
             if format == "json":

{unitysvc_services-0.2.0.dist-info → unitysvc_services-0.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unitysvc-services
-Version: 0.2.0
+Version: 0.2.2
 Summary: SDK for digital service providers on UnitySVC
 Author-email: Bo Peng <bo.peng@unitysvc.com>
 Maintainer-email: Bo Peng <bo.peng@unitysvc.com>

{unitysvc_services-0.2.0.dist-info → unitysvc_services-0.2.2.dist-info}/RECORD

@@ -3,8 +3,9 @@ unitysvc_services/cli.py,sha256=OK0IZyAckxP15jRWU_W49hl3t7XcNRtd8BoDMyRKqNM,682
 unitysvc_services/format_data.py,sha256=Jl9Vj3fRX852fHSUa5DzO-oiFQwuQHC3WMCDNIlo1Lc,5460
 unitysvc_services/list.py,sha256=QDp9BByaoeFeJxXJN9RQ-jU99mH9Guq9ampfXCbpZmI,7033
 unitysvc_services/populate.py,sha256=zkcjIy8BWuQSO7JwiRNHKgGoxQvc3ujluUQdYixdBvY,6626
-unitysvc_services/publisher.py,sha256=WzkUH9_Jxen9LzenzITVR8He40ohQHfNYcdwFztLKQ0,37755
-unitysvc_services/query.py,sha256=F-eWvDSXWCK-o8KAMEim1xA_oG7VISY53vrE8E1hmTQ,15094
+unitysvc_services/publisher.py,sha256=qLIEl2Ts_xCaCkIv8MC_8Up_fA6xIaK2aX4ZF_NVa8g,35383
+unitysvc_services/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+unitysvc_services/query.py,sha256=VHMaLCWAF5TyYhSkRnVzjhAZornGpSdET_QMvAi-G8k,14561
 unitysvc_services/scaffold.py,sha256=Y73IX8vskImxSvxDgR0mvEFuAMYnBKfttn3bjcz3jmQ,40331
 unitysvc_services/update.py,sha256=K9swocTUnqqiSgARo6GmuzTzUySSpyqqPPW4xF7ZU-g,9659
 unitysvc_services/utils.py,sha256=GN0gkVTU8fOx2G0EbqnWmx8w9eFsoPfRprPjwCyPYkE,11371
@@ -15,9 +16,9 @@ unitysvc_services/models/listing_v1.py,sha256=CC_GXoN3NHJFzEQ3cBHDQpdUaBNpvLdHAR
 unitysvc_services/models/provider_v1.py,sha256=cYK5kDDmzQEnLvUC2C8dKz-ZXci7hVn3fjNrJkaSr10,2050
 unitysvc_services/models/seller_v1.py,sha256=SU4rqYAh9hE4EeUrEkqaVrLwusenV7MotPF77VcsRKo,3263
 unitysvc_services/models/service_v1.py,sha256=u16zqM3khrJoTw_v0d45tMcKXjko5k_v3w8xwUtZ6nM,2720
-unitysvc_services-0.2.0.dist-info/licenses/LICENSE,sha256=_p8V6A8OMPu2HIztn3O01v0-urZFwk0Dd3Yk_PTIlL8,1065
-unitysvc_services-0.2.0.dist-info/METADATA,sha256=RMhmiHfB6yiAtiKsmmvrfT0L1IIBpprn0y0RVocjo20,6515
-unitysvc_services-0.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-unitysvc_services-0.2.0.dist-info/entry_points.txt,sha256=-vodnbPmo7QQmFu8jdG6sCyGRVM727w9Nhwp4Vwau_k,64
-unitysvc_services-0.2.0.dist-info/top_level.txt,sha256=GIotQj-Ro2ruR7eupM1r58PWqIHTAq647ORL7E2kneo,18
-unitysvc_services-0.2.0.dist-info/RECORD,,
+unitysvc_services-0.2.2.dist-info/licenses/LICENSE,sha256=_p8V6A8OMPu2HIztn3O01v0-urZFwk0Dd3Yk_PTIlL8,1065
+unitysvc_services-0.2.2.dist-info/METADATA,sha256=pmJ6eY72bkhsOuiKzAKUGspW6C9vSS6UwgMVHLBJQVY,6515
+unitysvc_services-0.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+unitysvc_services-0.2.2.dist-info/entry_points.txt,sha256=-vodnbPmo7QQmFu8jdG6sCyGRVM727w9Nhwp4Vwau_k,64
+unitysvc_services-0.2.2.dist-info/top_level.txt,sha256=GIotQj-Ro2ruR7eupM1r58PWqIHTAq647ORL7E2kneo,18
+unitysvc_services-0.2.2.dist-info/RECORD,,