wowool-build 0.0.3.dev2__py3-none-any.whl → 0.0.4.dev2__py3-none-any.whl

wowool/build/codeartifact.py

@@ -86,7 +86,7 @@ def delete_raw(
         raise UploadError(f"AWS CodeArtifact generic upload failed {cmd=}")
 
 
-def upload_raw(
+def upload_raw_aws_cli(
     fn: Path,
     namespace: str,
     package: str,
@@ -120,6 +120,92 @@ def upload_raw(
         raise UploadError(f"AWS CodeArtifact generic upload failed: {error}")
 
 
+def upload_raw(
+    fn: Path,
+    namespace: str,
+    package: str,
+    version: str,
+    aws: Optional[AwsCredentials] = None,
+    codeartifact: Optional[CodeArtifactCredentials] = None,
+    overwrite=False,
+):
+    """
+    Upload a raw asset to AWS CodeArtifact using boto3
+    """
+    fn = Path(fn)
+
+    try:
+        import boto3
+    except ImportError:
+        raise UploadError("boto3 is not installed. Please install it to use this function.")
+
+    aws = aws or AwsCredentials.from_environment()
+    codeartifact = codeartifact or CodeArtifactCredentials.from_environment()
+
+    # Check if credentials are valid
+    try:
+        sts_client = boto3.client("sts", region_name=aws.region)
+        identity = sts_client.get_caller_identity()
+        print(f"Using AWS Account: {identity['Account']}")
+    except Exception as e:
+        raise UploadError(f"AWS credential error: {e}")
+
+    # Create CodeArtifact client
+    client = boto3.client("codeartifact", region_name=aws.region)
+
+    # Delete existing version if overwrite is True
+    if overwrite:
+        try:
+            client.delete_package_versions(
+                domain=aws.domain,
+                domainOwner=str(aws.domain_owner),
+                repository=codeartifact.repository,
+                format="generic",
+                namespace=namespace,
+                package=package,
+                versions=[version],
+            )
+            print(f"Deleted existing version: {namespace}/{package}@{version}")
+        except Exception as error:
+            print(f"Note: Could not delete existing version: {error}", file=stderr)
+
+    # Calculate SHA-256 hash
+    try:
+        with open(fn, "rb", buffering=0) as ifs:
+            asset_hash = hashlib.file_digest(ifs, "sha256").hexdigest()
+    except Exception as error:
+        raise UploadError(f"Could not produce sha256 hash for {fn}: {error}")
+
+    # Read file content
+    try:
+        with open(fn, "rb") as f:
+            file_content = f.read()
+    except Exception as error:
+        raise UploadError(f"Could not read file {fn}: {error}")
+
+    # Upload the asset
+    try:
+        # Use publish_package_version instead
+        response = client.publish_package_version(
+            domain=aws.domain,
+            domainOwner=str(aws.domain_owner),
+            repository=codeartifact.repository,
+            format="generic",
+            namespace=namespace,
+            package=package,
+            packageVersion=version,
+            assetContent=file_content,
+            assetName=fn.name,
+            assetSHA256=asset_hash,
+            unfinished=True,
+        )
+
+        print(f"Successfully uploaded {fn.name} to {namespace}/{package}@{version}")
+        return response
+    except Exception as error:
+        raise UploadError(f"AWS CodeArtifact upload failed: {error}")
+
+
 def run_codeartifact(
     cmd: str,
     aws: Optional[AwsCredentials] = None,
@@ -212,20 +298,6 @@ def download_raw(
     except Exception as e:
         raise DownloadError(f"Error downloading asset: {str(e)} {output=}")
 
-    output = Path(output)
-
-    aws = aws or AwsCredentials.from_environment()
-    codeartifact = codeartifact or CodeArtifactCredentials.from_environment()
-    try:
-        cmd = f"""aws codeartifact get-package-version-asset --package-version {version} --domain {aws.domain} --domain-owner {aws.domain_owner} --region {aws.region} --repository {codeartifact.repository} --format generic --namespace {namespace} --package {package} --asset {output.name} {output}"""
-        result = run(cmd, shell=True, check=False, capture_output=True)
-        print(result.stdout.decode())
-        if result.returncode != 0:
-            print(result.stderr.decode(), file=stderr)
-            raise DownloadError(f"AWS CodeArtifact generic upload failed {cmd=}")
-    except Exception as error:
-        raise DownloadError(f"AWS CodeArtifact generic upload failed: {error}")
-
 
 def iter_packages(expression=".*", aws: Optional[AwsCredentials] = None, codeartifact: Optional[CodeArtifactCredentials] = None):
 

wowool/build/pypi.py

@@ -20,7 +20,7 @@ def upload_pypi(fp: Path, expression: str = "*", repository: str | None = None):
         _check_not_dirty(fn)
         repository = environ.get("TWINE_REPOSITORY", None)
         repository_option = f"--repository-url {repository}" if repository else ""
-        cmd = f"python -m twine upload {repository_option} dist/*"
+        cmd = f"python -m twine upload {repository_option} dist/{fn.name}"
         try:
             print(f"cmd: {cmd} {fn=} {fp_dist=}")
             run(cmd, shell=True, check=True, cwd=str(fp))

{wowool_build-0.0.3.dev2.dist-info → wowool_build-0.0.4.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wowool-build
-Version: 0.0.3.dev2
+Version: 0.0.4.dev2
 Summary: Wowool Build System
 Home-page: https://www.wowool.com/
 Author: Wowool

{wowool_build-0.0.3.dev2.dist-info → wowool_build-0.0.4.dev2.dist-info}/RECORD

@@ -1,14 +1,14 @@
-wowool/build/codeartifact.py,sha256=ZOCqYwEdt1vW0g-jSwJMd6UFJZvNWqvLduhu0-jC04Y,9658
+wowool/build/codeartifact.py,sha256=i1jOpdz7Ma3EGaFYq31W70h72XguuVBIZM4SIqRvI6Q,11619
 wowool/build/exceptions.py,sha256=04fMZc_bRMdinIqKCOqiwfO_xqwp_ZqO_SUgXfq4i58,88
 wowool/build/git.py,sha256=D3CGusjza6bkdI0YbKk-7HumbaPwNYxRWu9M0kT-rHc,3253
 wowool/build/logging.py,sha256=4ycT471N7V6vrEBXURF0-lho1hbmWA7PJyCHhfHVjeA,4988
 wowool/build/platform.py,sha256=dYEr4Pw0VyChQRnd0ZXwETXZsLVQ0tC9aC4Mu9KJZcc,901
 wowool/build/pydist.py,sha256=j_OiN2G-RVsQ8NwEv2gn19IBpJEcALIFUeYiDn_4NPY,3924
-wowool/build/pypi.py,sha256=fdPRdbPq2ZxWy3AdncL0qTWmUn_dA62NMWamwpC2Tto,921
+wowool/build/pypi.py,sha256=3nlqSu590F2vodUivIa7oz5g9ZTbHc8-cjTGnrGRI2Y,929
 wowool/build/pytask.py,sha256=wlwnQGfVkEUiA_IcRYnz9_BM7hNmzpT_1turmwYHFEM,2879
 wowool/build/pytest.py,sha256=8F1ZklSvpTAnwODXZvzhF6qcND-MlDVbl-e4F1Pf3mI,5304
 wowool/build/utility.py,sha256=q5RwGFD5O9pewuIUxbYt5sA7lj6u1CjWi6PVWQwCxnQ,890
-wowool_build-0.0.3.dev2.dist-info/METADATA,sha256=DfwuEatWo5eILABLTtFG9Msqom5fq-U_POXqk-XGCz0,355
-wowool_build-0.0.3.dev2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-wowool_build-0.0.3.dev2.dist-info/top_level.txt,sha256=zerqoDN-iHSHwsS1SN2h0q4H6RI1FOVeHW8fNQC9YdU,7
-wowool_build-0.0.3.dev2.dist-info/RECORD,,
+wowool_build-0.0.4.dev2.dist-info/METADATA,sha256=uK5jJ4RS0x1FWUmh5tmYDM_qAwSm0dFURFxF3Icy678,355
+wowool_build-0.0.4.dev2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+wowool_build-0.0.4.dev2.dist-info/top_level.txt,sha256=zerqoDN-iHSHwsS1SN2h0q4H6RI1FOVeHW8fNQC9YdU,7
+wowool_build-0.0.4.dev2.dist-info/RECORD,,