stackmachine 0.3.2__py3-none-any.whl → 0.3.3__py3-none-any.whl

stackmachine/__init__.py

@@ -54,6 +54,7 @@ from ._types import (
     DeployAppsSortBy,
     DeployAppVersionsSortBy,
     DeployAppWordPressExtraData,
+    DeploymentFilesInput,
     DeploymentProgressCallback,
     FileInput,
     Headers,
@@ -74,7 +75,7 @@ from ._uploads import create_zip
 try:
     __version__ = version("stackmachine")
 except PackageNotFoundError:
-    __version__ = "0.3.2"
+    __version__ = "0.3.3"
 
 __all__ = [
     "AppAlias",
@@ -105,6 +106,7 @@ __all__ = [
     "DeployAppWordPressExtraData",
     "DeployAppsListInput",
     "DeployAppsSortBy",
+    "DeploymentFilesInput",
     "DeploymentProgress",
     "DeploymentProgressCallback",
     "ExpectedDNSRecord",

stackmachine/_types.py

@@ -178,6 +178,7 @@ class DeployAppAutobuildInput(TypedDict, total=False):
     envVars: Optional[Sequence[Optional[DeployAppEnvVarInput]]]
     extra_data: Optional[DeployAppAutobuildExtraData]
     extraData: Optional[DeployAppAutobuildExtraData]
+    files: Optional[DeploymentFilesInput]
     install_cmd: Optional[str]
     installCmd: Optional[str]
     jobs: Optional[Sequence[Optional[DeployAppJobDefinitionInput]]]
@@ -240,15 +241,16 @@ class Readable(Protocol):
 
 FileInput = Union[str, bytes, bytearray, memoryview, Path, Readable]
 CreateZipFiles = Mapping[str, FileInput]
+DeploymentFilesInput = CreateZipFiles
 
 
 class UploadProgressCallback(Protocol):
-    def __call__(self, progress: "UploadProgress") -> None:
+    def __call__(self, progress: "UploadProgress", /) -> None:
         ...
 
 
 class DeploymentProgressCallback(Protocol):
-    def __call__(self, progress: "DeploymentProgress") -> None:
+    def __call__(self, progress: "DeploymentProgress", /) -> None:
         ...
 
 

stackmachine/resources/apps.py

@@ -20,8 +20,8 @@ from .._types import (
     DeployAppsSortBy,
     PaginationOptions,
     RequestOptionsLike,
+    UploadProgressCallback,
 )
-from .._utils import camelize, merge_input
 from ._shared import page_variables, resource_missing_error
 from .deployments import (
     AsyncDeployment,
@@ -148,10 +148,20 @@ class DeployAppsResource:
         input: Optional[DeployAppAutobuildInput] = None,
         *,
         request_options: Optional[RequestOptionsLike] = None,
+        chunk_size: Optional[int] = None,
+        on_upload_progress: Optional[UploadProgressCallback] = None,
+        timeout: Optional[float] = None,
+        max_network_retries: Optional[int] = None,
         **kwargs: Unpack[DeployAppAutobuildInput],
     ) -> Deployment:
         return self._deployments.create(
-            camelize(merge_input(input, **kwargs)), request_options=request_options
+            input,
+            request_options=request_options,
+            chunk_size=chunk_size,
+            on_upload_progress=on_upload_progress,
+            timeout=timeout,
+            max_network_retries=max_network_retries,
+            **kwargs,
         )
 
     del_ = delete
@@ -273,10 +283,20 @@ class AsyncDeployAppsResource:
         input: Optional[DeployAppAutobuildInput] = None,
         *,
         request_options: Optional[RequestOptionsLike] = None,
+        chunk_size: Optional[int] = None,
+        on_upload_progress: Optional[UploadProgressCallback] = None,
+        timeout: Optional[float] = None,
+        max_network_retries: Optional[int] = None,
         **kwargs: Unpack[DeployAppAutobuildInput],
     ) -> AsyncDeployment:
         return await self._deployments.create(
-            camelize(merge_input(input, **kwargs)), request_options=request_options
+            input,
+            request_options=request_options,
+            chunk_size=chunk_size,
+            on_upload_progress=on_upload_progress,
+            timeout=timeout,
+            max_network_retries=max_network_retries,
+            **kwargs,
         )
 
     del_ = delete

stackmachine/resources/deployments.py

@@ -3,24 +3,47 @@ from __future__ import annotations
 import asyncio
 import threading
 import warnings
-from typing import Any, Callable, Mapping, Optional
+from typing import Any, Callable, Mapping, Optional, cast
 
 from typing_extensions import Unpack
 
-from .._errors import StackMachineAPIError
+from .._errors import StackMachineAPIError, StackMachineValidationError
 from .._graphql import operations as gql
 from .._models import DeployAppVersion, DeploymentProgress
 from .._types import (
+    CreateZipFiles,
     DeployAppAutobuildInput,
     DeploymentProgressCallback,
     RequestOptionsLike,
+    UploadProgressCallback,
 )
+from .._uploads import create_zip
 from .._utils import camelize, merge_input
 from ._shared import required_payload, resource_missing_error
 
 FAILED_STATUSES = {"CANCELLED", "FAILED", "INTERNAL_ERROR", "TIMEOUT"}
 
 
+def _merge_deployment_create_input(
+    input: Optional[DeployAppAutobuildInput],
+    kwargs: DeployAppAutobuildInput,
+) -> tuple[dict[str, object], Optional[CreateZipFiles]]:
+    deployment_input = merge_input(input, **kwargs)
+    files = deployment_input.pop("files", None)
+    has_upload_url = (
+        deployment_input.get("upload_url") is not None
+        or deployment_input.get("uploadUrl") is not None
+    )
+    if files is not None and has_upload_url:
+        raise StackMachineValidationError(
+            "`files` cannot be passed together with `upload_url`; "
+            "pass one deployment source.",
+            code="invalid_deployment_source",
+            param="files",
+        )
+    return deployment_input, cast(Optional[CreateZipFiles], files)
+
+
 class Deployment:
     def __init__(
         self,
@@ -275,11 +298,27 @@ class DeploymentsResource:
         input: Optional[DeployAppAutobuildInput] = None,
         *,
         request_options: Optional[RequestOptionsLike] = None,
+        chunk_size: Optional[int] = None,
+        on_upload_progress: Optional[UploadProgressCallback] = None,
+        timeout: Optional[float] = None,
+        max_network_retries: Optional[int] = None,
         **kwargs: Unpack[DeployAppAutobuildInput],
     ) -> Deployment:
+        deployment_input, files = _merge_deployment_create_input(input, kwargs)
+        if files is not None:
+            upload_url = self._client.files.upload(
+                create_zip(files),
+                chunk_size=chunk_size,
+                on_progress=on_upload_progress,
+                timeout=timeout,
+                max_network_retries=max_network_retries,
+                request_options=request_options,
+            )
+            deployment_input["upload_url"] = upload_url
+
         response = self._client._mutation(
             gql.AUTOBUILD_MUTATION,
-            {"input": camelize(merge_input(input, **kwargs))},
+            {"input": camelize(deployment_input)},
             request_options=request_options,
         )
         payload = required_payload(
@@ -358,11 +397,27 @@ class AsyncDeploymentsResource:
         input: Optional[DeployAppAutobuildInput] = None,
         *,
         request_options: Optional[RequestOptionsLike] = None,
+        chunk_size: Optional[int] = None,
+        on_upload_progress: Optional[UploadProgressCallback] = None,
+        timeout: Optional[float] = None,
+        max_network_retries: Optional[int] = None,
         **kwargs: Unpack[DeployAppAutobuildInput],
     ) -> AsyncDeployment:
+        deployment_input, files = _merge_deployment_create_input(input, kwargs)
+        if files is not None:
+            upload_url = await self._client.files.upload(
+                create_zip(files),
+                chunk_size=chunk_size,
+                on_progress=on_upload_progress,
+                timeout=timeout,
+                max_network_retries=max_network_retries,
+                request_options=request_options,
+            )
+            deployment_input["upload_url"] = upload_url
+
         response = await self._client._mutation(
             gql.AUTOBUILD_MUTATION,
-            {"input": camelize(merge_input(input, **kwargs))},
+            {"input": camelize(deployment_input)},
             request_options=request_options,
         )
         payload = required_payload(

{stackmachine-0.3.2.dist-info → stackmachine-0.3.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: stackmachine
-Version: 0.3.2
+Version: 0.3.3
 Summary: Python SDK for StackMachine.
 Project-URL: Homepage, https://github.com/stackmachine/sdks/tree/main/python
 Project-URL: Repository, https://github.com/stackmachine/sdks
@@ -99,8 +99,12 @@ async for app in apps:
 
 ```python
 deployment = stackmachine.deployments.create(
-    upload_url="https://example.com/app.zip",
-    app_name="my-app",
+    app_name="hello-stackmachine",
+    owner="stackmachine",
+    files={
+        "index.html": "<html><body><h1>Hello StackMachine</h1></body></html>",
+    },
+    on_upload_progress=lambda progress: print("Uploading", progress.percent * 100),
 )
 
 version = deployment.wait()
@@ -108,13 +112,18 @@ version = deployment.wait()
 
 ```python
 deployment = stackmachine.apps.autobuild(
-    upload_url="https://example.com/app.zip",
-    app_name="my-app",
+    app_name="hello-stackmachine",
+    owner="stackmachine",
+    files={
+        "index.html": "<html><body><h1>Hello StackMachine</h1></body></html>",
+    },
 )
 ```
 
 ## Files
 
+Use this path only for manual package uploads:
+
 ```python
 from stackmachine import create_zip
 

{stackmachine-0.3.2.dist-info → stackmachine-0.3.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-stackmachine/__init__.py,sha256=bwLDfnAqwPNZXPsuu9A4eeSRWjZP4aVpfFfLvur2Oos,3742
+stackmachine/__init__.py,sha256=TRIOYAYdQGK0-CAdy6xBf3QTOrNqXsjn8UbPFioYKw4,3796
 stackmachine/_async_client.py,sha256=nZ5Rxbw6Yk8-3cv124p3tKcf_xyRiuYNcWnCiviIaDs,6570
 stackmachine/_client.py,sha256=e3pdGdrCqgSJ4iNxmbyQI74rs41HrbaWI18s9sVMTQg,6396
 stackmachine/_config.py,sha256=vZUvZEIKRkCmAqq8dJ5B6r9cWF0rjHQ21AGS4hsaMKc,912
@@ -6,7 +6,7 @@ stackmachine/_errors.py,sha256=yVJ4U1wUK4kPDXs_PxSlg9VdN9cpmUluToqvKR9r5kc,2708
 stackmachine/_models.py,sha256=sJBXZyN7o16iIsvbeVaSyE5XZmRsnV8zRnmgAmxKMa8,6211
 stackmachine/_pagination.py,sha256=OLeqVZ5ClGjgtDVww3ghN0Va-ExwkZ_SI6FtqQH__ug,11730
 stackmachine/_transport.py,sha256=Jah57TIssaq-zQxyIw8xuV-eROPkg-jE-_9qgzHUbi0,21048
-stackmachine/_types.py,sha256=4P0rgrpEPvZhf9heFjBbTX1nyDoMN4GrLkqXqnBmBds,6673
+stackmachine/_types.py,sha256=ZtfXaGPLlG6c4tTgHvfxZLs23K2wzbX5BOkspZUVUiE,6759
 stackmachine/_uploads.py,sha256=fl0RIh3W0d0vcTOSB1zbg6fTk9lxxyXjLKEyUryAgao,12772
 stackmachine/_utils.py,sha256=sdx1vsNQrGeoHubg7S1aE0v2UYa_95OyQ13iF9pAgmU,2329
 stackmachine/py.typed,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
@@ -14,12 +14,12 @@ stackmachine/_graphql/__init__.py,sha256=pjh20cuYTQMGJn6lSQY-hYXJAXqYr8Y8z1Vc5si
 stackmachine/_graphql/operations.py,sha256=HKBuWK_Rsz_qCKSfWyzclKq7pA1R6k9R-RdKP2mnrPw,9228
 stackmachine/resources/__init__.py,sha256=tfjWfWceGbahDMmD_xt_xkapqSThD7tyP7_5cnKF3xQ,364
 stackmachine/resources/_shared.py,sha256=u1lSxX3WYGd6JDOrxr9PBOHbaqBQ48kO5xIbJBsErIk,1227
-stackmachine/resources/apps.py,sha256=P4Ez98g0UzZ2ZIurrbdYmPW5zRkUs8BelWurvra_XJk,9777
-stackmachine/resources/deployments.py,sha256=1TFBFJ5oVBMowGta2Ypsrt_1M_dsWYV6fYsaDQyNocU,14172
+stackmachine/resources/apps.py,sha256=dB_1pjzqXMKNDxT2ewziumMJULMtKuBVMQccaU-0jCA,10508
+stackmachine/resources/deployments.py,sha256=IcFiIbYiD_4cwvvE9sRY4JSnmANVShj3GaBCgv0o67U,16433
 stackmachine/resources/domains.py,sha256=oBbtp2X6ya5BQvhFtXFz7aKUGZcqTO4Ky-kOo-GhX_8,10801
 stackmachine/resources/files.py,sha256=j4fFnFuz2-zM8MRvmRxv7jC47Q_NiTQaYCpR0Kb4Gpk,2701
 stackmachine/resources/ssh.py,sha256=tbqVWyAqeNf_eCjftF1b2Q1ED-ocpuRC2rSHyuzdRGM,22359
 stackmachine/resources/versions.py,sha256=VYMUS2KdoEh4POHm5IFF0Sy1xNI8jrwpHhtoKqgUqfk,7426
-stackmachine-0.3.2.dist-info/METADATA,sha256=gtJcf8dtBiJg3I6qb11uzTouVp3OM0gDxiG4sEYe9bs,4315
-stackmachine-0.3.2.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-stackmachine-0.3.2.dist-info/RECORD,,
+stackmachine-0.3.3.dist-info/METADATA,sha256=pXm3txC1GNNnrPsbAvIWRvPdsCi_NCh1A_Iv4ySz5i0,4627
+stackmachine-0.3.3.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+stackmachine-0.3.3.dist-info/RECORD,,