aimodelshare 0.1.29__py3-none-any.whl → 0.1.30__py3-none-any.whl

aimodelshare/aimsonnx.py

@@ -579,7 +579,7 @@ def _keras_to_onnx(model, transfer_learning=None,
     output_path = os.path.join(temp_dir, 'temp.onnx')
     
     
-    model.save(temp_dir)
+    tf.saved_model.save(model, temp_dir)
 
     # # Convert the model
     try:

aimodelshare/data_sharing/download_data.py

@@ -76,110 +76,88 @@ def download_layer(layer, layer_count, tmp_img_dir, blobs_resp):
 	return layer_id, layer_dir
 
 def pull_image(image_uri):
-    import os
-    import requests
-    import tempfile
-    import json
-    import shutil
-    import tarfile
-    from aimodelshare.data_sharing.utils import redo_with_write
-
-    image_uri_parts = image_uri.split('/')
-
-    registry = image_uri_parts[0]    
-    image, tag = image_uri_parts[2].split(':')
-    repository = '/'.join([image_uri_parts[1], image])
-
-    auth_url = get_auth_url(registry)
-
-    # Request manifest with correct Accept header
-    auth_head = get_auth_head(auth_url, registry, repository)
-    manifest_url = f'https://{registry}/v2/{repository}/manifests/{tag}'
-    resp = requests.get(manifest_url, headers=auth_head, verify=False)
-
-    # --- PATCH: Handle manifest list (multi-platform images) ---
-    if resp.headers.get('Content-Type') == 'application/vnd.docker.distribution.manifest.list.v2+json':
-        manifest_list = resp.json()
-
-        # Find the first linux/amd64 image (or fallback to first available)
-        target_manifest = next(
-            (m for m in manifest_list['manifests']
-             if m['platform'].get('architecture') == 'amd64' and m['platform'].get('os') == 'linux'),
-            manifest_list['manifests'][0]
-        )
-        digest = target_manifest['digest']
-
-        # Get the actual image manifest now
-        resp = requests.get(
-            f'https://{registry}/v2/{repository}/manifests/{digest}',
-            headers=auth_head,
-            verify=False
-        )
-    # -----------------------------------------------------------
-
-    manifest = resp.json()
-
-    # Safely check and fail early if config key is still missing
-    if 'config' not in manifest:
-        raise ValueError("Manifest response missing 'config'. This image may not follow Docker V2 manifest schema.")
-
-    config = manifest['config']['digest']
-    config_resp = requests.get(f'https://{registry}/v2/{repository}/blobs/{config}', headers=auth_head, verify=False)
-
-    tmp_img_dir = os.path.join(tempfile.gettempdir(), f'tmp_{image}_{tag}')
-    os.mkdir(tmp_img_dir)
-
-    with open(f'{tmp_img_dir}/{config[7:]}.json', 'wb') as file:
-        file.write(config_resp.content)
-
-    content = [{
-        'Config': config[7:] + '.json',
-        'RepoTags': [image_uri],
-        'Layers': []
-    }]
-
-    # Skip first 6 layers? Keep original logic for compatibility
-    layers = manifest['layers'][6:]
-    layer_count = 0
-
-    for layer in layers:
-        layer_count += 1
-        auth_head = get_auth_head(auth_url, registry, repository)
-        blobs_resp = requests.get(
-            f'https://{registry}/v2/{repository}/blobs/{layer["digest"]}',
-            headers=auth_head,
-            stream=True,
-            verify=False
-        )
-
-        layer_id, layer_dir = download_layer(layer, layer_count, tmp_img_dir, blobs_resp)
-        content[0]['Layers'].append(layer_id + '/layer.tar')
-
-        json_path = os.path.join(layer_dir, 'json')
-        with open(json_path, 'w') as file:
-            if layers[-1]['digest'] == layer['digest']:
-                json_obj = json.loads(config_resp.content)
-                json_obj.pop('history', None)
-                json_obj.pop('rootfs', None)
-            else:
-                json_obj = {}
-            json_obj['id'] = layer_id
-            file.write(json.dumps(json_obj))
-
-    with open(os.path.join(tmp_img_dir, 'manifest.json'), 'w') as f:
-        f.write(json.dumps(content))
-
-    repo_dict = {'/'.join(image_uri_parts[:-1]) + '/' + image: {tag: layer_id}}
-    with open(os.path.join(tmp_img_dir, 'repositories'), 'w') as f:
-        f.write(json.dumps(repo_dict))
-
-    # Create tar archive from temp image directory
-    docker_tar = os.path.join(tempfile.gettempdir(), f'{repository.replace("/", "_")}_{tag}.tar')
-    with tarfile.open(docker_tar, "w") as tar:
-        tar.add(tmp_img_dir, arcname=os.path.sep)
-
-    shutil.rmtree(tmp_img_dir, onerror=redo_with_write)
-    return docker_tar
+
+	image_uri_parts = image_uri.split('/')
+
+	registry = image_uri_parts[0]	
+	image, tag = image_uri_parts[2].split(':')
+	repository = '/'.join([image_uri_parts[1], image])
+
+	auth_url = get_auth_url(registry)
+
+	auth_head = get_auth_head(auth_url, registry, repository)
+
+	resp = requests.get('https://{}/v2/{}/manifests/{}'.format(registry, repository, tag), headers=auth_head, verify=False)
+	
+	print(resp.json())
+	config = resp.json()['config']['digest']
+	config_resp = requests.get('https://{}/v2/{}/blobs/{}'.format(registry, repository, config), headers=auth_head, verify=False)
+
+	tmp_img_dir = tempfile.gettempdir() + '/' + 'tmp_{}_{}'.format(image, tag)
+	os.mkdir(tmp_img_dir)
+
+	file = open('{}/{}.json'.format(tmp_img_dir, config[7:]), 'wb')
+	file.write(config_resp.content)
+	file.close()
+
+	content = [{
+		'Config': config[7:] + '.json',
+		'RepoTags': [],
+		'Layers': []
+	}]
+	content[0]['RepoTags'].append(image_uri)
+
+	layer_count=0
+	layers = resp.json()['layers'][6:]
+
+	for layer in layers:
+
+		layer_count += 1
+
+		auth_head = get_auth_head(auth_url, registry, repository) # done to keep from expiring
+		blobs_resp = requests.get('https://{}/v2/{}/blobs/{}'.format(registry, repository, layer['digest']), headers=auth_head, stream=True, verify=False)
+
+		layer_id, layer_dir = download_layer(layer, layer_count, tmp_img_dir, blobs_resp)
+		content[0]['Layers'].append(layer_id + '/layer.tar')
+
+		# Creating json file
+		file = open(layer_dir + '/json', 'w')
+
+		# last layer = config manifest - history - rootfs
+		if layers[-1]['digest'] == layer['digest']:
+			json_obj = json.loads(config_resp.content)
+			del json_obj['history']
+			del json_obj['rootfs']
+		else: # other layers json are empty
+			json_obj = json.loads('{}')
+		
+		json_obj['id'] = layer_id
+		file.write(json.dumps(json_obj))
+		file.close()
+
+	file = open(tmp_img_dir + '/manifest.json', 'w')
+	file.write(json.dumps(content))
+	file.close()
+
+	content = {
+		'/'.join(image_uri_parts[:-1]) + '/' + image : { tag : layer_id }
+	}
+
+	file = open(tmp_img_dir + '/repositories', 'w')
+	file.write(json.dumps(content))
+	file.close()
+
+	# Create image tar and clean tmp folder
+	docker_tar = tempfile.gettempdir() + '/' + '_'.join([repository.replace('/', '_'), tag]) + '.tar'
+	sys.stdout.flush()
+
+	tar = tarfile.open(docker_tar, "w")
+	tar.add(tmp_img_dir, arcname=os.path.sep)
+	tar.close()
+
+	shutil.rmtree(tmp_img_dir, onerror=redo_with_write)
+
+	return docker_tar
 
 
 def extract_data_from_image(image_name, file_name, location):
@@ -219,10 +197,11 @@ def import_quickstart_data(tutorial, section="modelplayground"):
    
     #Download Quick Start materials
     if all([tutorial == "flowers", section == "modelplayground"]):
-        quickstart_repository = "public.ecr.aws/y2e2a1d6/quickstart_materials-repository:latest"   
+        quickstart_repository = "public.ecr.aws/z5w0c9e9/quickstart_materials-repository:latest"
         existing_folder = 'flower_competition_data'
+
     if all([tutorial == "flowers", section == "competition"]):
-        quickstart_repository = "public.ecr.aws/y2e2a1d6/quickstart_flowers_competition-repository:latest"
+        quickstart_repository = "public.ecr.aws/z5w0c9e9/quickstart_flowers_competition-repository:latest"
         existing_folder = 'flower_competition_data'
     
     if all([tutorial == "mnist", section == "modelplayground"]):

{aimodelshare-0.1.29.dist-info → aimodelshare-0.1.30.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aimodelshare
-Version: 0.1.29
+Version: 0.1.30
 Summary: Deploy locally saved machine learning models to a live rest API and web-dashboard.  Share it with the world via modelshare.org
 Home-page: https://www.modelshare.org
 Author: Michael Parrott

{aimodelshare-0.1.29.dist-info → aimodelshare-0.1.30.dist-info}/RECORD

@@ -1,6 +1,6 @@
 aimodelshare/README.md,sha256=_OMdUIeIYZnpFlKdafM1KNWaANO2nWdx0QpLE_ZC-Qs,2014
 aimodelshare/__init__.py,sha256=CS0iFxgAic21gBcQE6NSZ-D_ElHw80_A3OWrEYo9Dks,539
-aimodelshare/aimsonnx.py,sha256=bHjp2iEBSGKzfScDX4wn9I7lR2wPSMpdgi8qmroz4nY,69282
+aimodelshare/aimsonnx.py,sha256=fmOgHVc6SL1cH9zt2EHiPOVLXGunQuteo6XE4cc_LA0,69298
 aimodelshare/api.py,sha256=jeCIMbpBllTYi-bPvCdNvI6yHaT3JYakq9fgaz10s_E,34920
 aimodelshare/aws.py,sha256=jn99R9-N77Qac-_eYm-LaCQUPd-RnE7oVULm9rh-3RY,15232
 aimodelshare/aws_client.py,sha256=Ce19iwf69BwpuyyJlVN8z1da3c5jf93svsTgx1OWhaA,6784
@@ -31,7 +31,7 @@ aimodelshare/containerization_templates/lambda_function.txt,sha256=nEFoPDXemNcQZ
 aimodelshare/custom_approach/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 aimodelshare/custom_approach/lambda_function.py,sha256=d1HZlgviHZq4mNBKx4q-RCunDK8P8i9DKZcfv6Nmgzc,479
 aimodelshare/data_sharing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-aimodelshare/data_sharing/download_data.py,sha256=zZDnZou1x4QXdPSlD-1OfCBow4XoYgq8JzlCy7tobXw,24273
+aimodelshare/data_sharing/download_data.py,sha256=Hd9QUKfC2GQqBuJhzjVIHNYz8rksN7Nl3B52U7WIqxA,22815
 aimodelshare/data_sharing/share_data.py,sha256=dMOP0-PTSpviOeHi3Nvj-uiq5PlIfk_SN5nN92j4PnI,13964
 aimodelshare/data_sharing/utils.py,sha256=865lN8-oGFi_U_zRaNnGB8Bd0sC8dN_iI5krZOSt_Ts,236
 aimodelshare/data_sharing/data_sharing_templates/Dockerfile.txt,sha256=27wmp7b0rXqJQsumhPxCvGHmUcDiiVgrC6i7DmY7KQA,77
@@ -140,11 +140,11 @@ aimodelshare/sam/codepipeline_policies.txt,sha256=267HMXMnbP7qRASkmFZYSx-2HmKf5o
 aimodelshare/sam/codepipeline_trust_relationship.txt,sha256=yfPYvZlN3fnaIHs7I3ENMMveigIE89mufV9pvR8EQH8,245
 aimodelshare/sam/spark-class.txt,sha256=chyJBxDzCzlUKXzVQYTzuJ2PXCTwg8_gd1yfnI-xbRw,217
 aimodelshare/sam/template.txt,sha256=JKSvEOZNaaLalHSx7r9psJg_6LLCb0XLAYi1-jYPu3M,1195
-aimodelshare-0.1.29.dist-info/licenses/LICENSE,sha256=JXBYLriXYgTloZs-9CJPZY76dqkuDT5df_HghMnljx8,1134
+aimodelshare-0.1.30.dist-info/licenses/LICENSE,sha256=JXBYLriXYgTloZs-9CJPZY76dqkuDT5df_HghMnljx8,1134
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_aimsonnx.py,sha256=-GOF1_qXGQaMxHyqK0GPg7dD1meE-S7CZea4pLmBDTk,3906
 tests/test_playground.py,sha256=vdFWPRrZNQ2poiBOoN3l7HsXB5yc3p3rrrclNYJHnaw,24574
-aimodelshare-0.1.29.dist-info/METADATA,sha256=2ow3I21HD8bAggVYmz6TDBn6BhfesGQIsvqhcul_Slw,3523
-aimodelshare-0.1.29.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-aimodelshare-0.1.29.dist-info/top_level.txt,sha256=2KJgeHQ0BmZuilB75J203i7W4vri6CON2kdbwk9BNpU,19
-aimodelshare-0.1.29.dist-info/RECORD,,
+aimodelshare-0.1.30.dist-info/METADATA,sha256=VsmKA64cn84DXDDgHNTM92DE2chwVJU_mVyN1fm7QHw,3523
+aimodelshare-0.1.30.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+aimodelshare-0.1.30.dist-info/top_level.txt,sha256=2KJgeHQ0BmZuilB75J203i7W4vri6CON2kdbwk9BNpU,19
+aimodelshare-0.1.30.dist-info/RECORD,,

{aimodelshare-0.1.29.dist-info → aimodelshare-0.1.30.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (79.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any