aimodelshare 0.1.27__tar.gz → 0.1.29__tar.gz

{aimodelshare-0.1.27/aimodelshare.egg-info → aimodelshare-0.1.29}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: aimodelshare
-Version: 0.1.27
+Version: 0.1.29
 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
@@ -11,33 +11,43 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: boto3==1.26.69
-Requires-Dist: botocore==1.29.82
-Requires-Dist: scikit-learn==1.2.2
-Requires-Dist: onnx==1.13.1
-Requires-Dist: onnxconverter-common>=1.7.0
+Requires-Dist: boto3==1.34.69
+Requires-Dist: botocore==1.34.69
+Requires-Dist: scikit-learn==1.6.0
+Requires-Dist: onnx==1.14.1
+Requires-Dist: onnxconverter-common==1.14.0
 Requires-Dist: regex
-Requires-Dist: keras2onnx>=1.7.0
-Requires-Dist: tensorflow>=2.12
-Requires-Dist: tf2onnx
-Requires-Dist: skl2onnx>=1.14.0
-Requires-Dist: onnxruntime>=1.7.0
-Requires-Dist: torch>=1.8.1
-Requires-Dist: pydot==1.3.0
-Requires-Dist: importlib-resources==5.10.0
-Requires-Dist: onnxmltools>=1.6.1
-Requires-Dist: Pympler==0.9
-Requires-Dist: docker==5.0.0
+Requires-Dist: keras2onnx==1.7.0
+Requires-Dist: tensorflow==2.18.0
+Requires-Dist: tf2onnx==1.16.1
+Requires-Dist: skl2onnx==1.18.0
+Requires-Dist: onnxruntime==1.17.1
+Requires-Dist: torch==2.6.0
+Requires-Dist: pydot==1.4.2
+Requires-Dist: importlib-resources==6.1.1
+Requires-Dist: onnxmltools==1.11.0
+Requires-Dist: Pympler==1.0.1
+Requires-Dist: docker==6.1.3
 Requires-Dist: wget==3.2
-Requires-Dist: PyJWT>=2.4.0
-Requires-Dist: seaborn>=0.11.2
+Requires-Dist: PyJWT==2.8.0
+Requires-Dist: seaborn==0.13.2
 Requires-Dist: astunparse==1.6.3
-Requires-Dist: shortuuid>=1.0.8
-Requires-Dist: psutil>=5.9.1
-Requires-Dist: pathlib>=1.0.1
-Requires-Dist: protobuf>=3.20.1
-Requires-Dist: dill
-Requires-Dist: scikeras
+Requires-Dist: shortuuid==1.0.11
+Requires-Dist: psutil==5.9.5
+Requires-Dist: pathlib
+Requires-Dist: protobuf==3.20.3
+Requires-Dist: dill==0.3.7
+Requires-Dist: scikeras==0.11.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 
 # aimodelshare

{aimodelshare-0.1.27 → aimodelshare-0.1.29}/aimodelshare/data_sharing/download_data.py

@@ -76,87 +76,111 @@ 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)
-    
-	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):
     tar = tarfile.open(image_name, 'r')

{aimodelshare-0.1.27 → aimodelshare-0.1.29/aimodelshare.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: aimodelshare
-Version: 0.1.27
+Version: 0.1.29
 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
@@ -11,33 +11,43 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: boto3==1.26.69
-Requires-Dist: botocore==1.29.82
-Requires-Dist: scikit-learn==1.2.2
-Requires-Dist: onnx==1.13.1
-Requires-Dist: onnxconverter-common>=1.7.0
+Requires-Dist: boto3==1.34.69
+Requires-Dist: botocore==1.34.69
+Requires-Dist: scikit-learn==1.6.0
+Requires-Dist: onnx==1.14.1
+Requires-Dist: onnxconverter-common==1.14.0
 Requires-Dist: regex
-Requires-Dist: keras2onnx>=1.7.0
-Requires-Dist: tensorflow>=2.12
-Requires-Dist: tf2onnx
-Requires-Dist: skl2onnx>=1.14.0
-Requires-Dist: onnxruntime>=1.7.0
-Requires-Dist: torch>=1.8.1
-Requires-Dist: pydot==1.3.0
-Requires-Dist: importlib-resources==5.10.0
-Requires-Dist: onnxmltools>=1.6.1
-Requires-Dist: Pympler==0.9
-Requires-Dist: docker==5.0.0
+Requires-Dist: keras2onnx==1.7.0
+Requires-Dist: tensorflow==2.18.0
+Requires-Dist: tf2onnx==1.16.1
+Requires-Dist: skl2onnx==1.18.0
+Requires-Dist: onnxruntime==1.17.1
+Requires-Dist: torch==2.6.0
+Requires-Dist: pydot==1.4.2
+Requires-Dist: importlib-resources==6.1.1
+Requires-Dist: onnxmltools==1.11.0
+Requires-Dist: Pympler==1.0.1
+Requires-Dist: docker==6.1.3
 Requires-Dist: wget==3.2
-Requires-Dist: PyJWT>=2.4.0
-Requires-Dist: seaborn>=0.11.2
+Requires-Dist: PyJWT==2.8.0
+Requires-Dist: seaborn==0.13.2
 Requires-Dist: astunparse==1.6.3
-Requires-Dist: shortuuid>=1.0.8
-Requires-Dist: psutil>=5.9.1
-Requires-Dist: pathlib>=1.0.1
-Requires-Dist: protobuf>=3.20.1
-Requires-Dist: dill
-Requires-Dist: scikeras
+Requires-Dist: shortuuid==1.0.11
+Requires-Dist: psutil==5.9.5
+Requires-Dist: pathlib
+Requires-Dist: protobuf==3.20.3
+Requires-Dist: dill==0.3.7
+Requires-Dist: scikeras==0.11.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 
 # aimodelshare

aimodelshare-0.1.29/aimodelshare.egg-info/requires.txt

@@ -0,0 +1,27 @@
+boto3==1.34.69
+botocore==1.34.69
+scikit-learn==1.6.0
+onnx==1.14.1
+onnxconverter-common==1.14.0
+regex
+keras2onnx==1.7.0
+tensorflow==2.18.0
+tf2onnx==1.16.1
+skl2onnx==1.18.0
+onnxruntime==1.17.1
+torch==2.6.0
+pydot==1.4.2
+importlib-resources==6.1.1
+onnxmltools==1.11.0
+Pympler==1.0.1
+docker==6.1.3
+wget==3.2
+PyJWT==2.8.0
+seaborn==0.13.2
+astunparse==1.6.3
+shortuuid==1.0.11
+psutil==5.9.5
+pathlib
+protobuf==3.20.3
+dill==0.3.7
+scikeras==0.11.0

aimodelshare-0.1.29/setup.py

@@ -0,0 +1,55 @@
+
+import setuptools
+
+with open("README.md", "r") as fh:
+    long_description = fh.read()
+
+setuptools.setup(
+    name='aimodelshare', #TODO:update
+    version='0.1.29',        #TODO:update
+    author="Michael Parrott",
+    author_email="mikedparrott@modelshare.org",
+    description="Deploy locally saved machine learning models to a live rest API and web-dashboard.  Share it with the world via modelshare.org",
+    long_description=long_description,
+    long_description_content_type="text/markdown",
+    url="https://www.modelshare.org",
+    packages=setuptools.find_packages(),
+    install_requires=[
+        "boto3==1.34.69",
+        "botocore==1.34.69",
+        "scikit-learn==1.6.0",
+        "onnx==1.14.1",
+        "onnxconverter-common==1.14.0",
+        "regex",
+        "keras2onnx==1.7.0",
+        "tensorflow==2.18.0",
+        "tf2onnx==1.16.1",
+        "skl2onnx==1.18.0",
+        "onnxruntime==1.17.1",
+        "torch==2.6.0",
+        "pydot==1.4.2",
+        "importlib-resources==6.1.1",
+        "onnxmltools==1.11.0",
+        "Pympler==1.0.1",
+        "docker==6.1.3",
+        "wget==3.2",
+        "PyJWT==2.8.0",
+        "seaborn==0.13.2",
+        "astunparse==1.6.3",
+        "shortuuid==1.0.11",
+        "psutil==5.9.5",
+        "pathlib",  # standard in Python 3.11
+        "protobuf==3.20.3",
+        "dill==0.3.7",
+        "scikeras==0.11.0"]
+
+
+      ,
+    classifiers=[
+        "Programming Language :: Python :: 3",
+        "License :: Other/Proprietary License",
+        "Operating System :: OS Independent",
+    ],
+    python_requires='>=3.7',
+    include_package_data=True)
+  

aimodelshare-0.1.27/aimodelshare.egg-info/requires.txt

@@ -1,27 +0,0 @@
-boto3==1.26.69
-botocore==1.29.82
-scikit-learn==1.2.2
-onnx==1.13.1
-onnxconverter-common>=1.7.0
-regex
-keras2onnx>=1.7.0
-tensorflow>=2.12
-tf2onnx
-skl2onnx>=1.14.0
-onnxruntime>=1.7.0
-torch>=1.8.1
-pydot==1.3.0
-importlib-resources==5.10.0
-onnxmltools>=1.6.1
-Pympler==0.9
-docker==5.0.0
-wget==3.2
-PyJWT>=2.4.0
-seaborn>=0.11.2
-astunparse==1.6.3
-shortuuid>=1.0.8
-psutil>=5.9.1
-pathlib>=1.0.1
-protobuf>=3.20.1
-dill
-scikeras

aimodelshare-0.1.27/setup.py

@@ -1,28 +0,0 @@
-
-import setuptools
-
-with open("README.md", "r") as fh:
-    long_description = fh.read()
-
-setuptools.setup(
-    name='aimodelshare', #TODO:update
-    version='0.1.27',        #TODO:update
-    author="Michael Parrott",
-    author_email="mikedparrott@modelshare.org",
-    description="Deploy locally saved machine learning models to a live rest API and web-dashboard.  Share it with the world via modelshare.org",
-    long_description=long_description,
-    long_description_content_type="text/markdown",
-    url="https://www.modelshare.org",
-    packages=setuptools.find_packages(),
-    install_requires=["boto3==1.26.69", "botocore==1.29.82","scikit-learn==1.2.2","onnx==1.13.1","onnxconverter-common>=1.7.0", "regex",
-    "keras2onnx>=1.7.0","tensorflow>=2.12","tf2onnx","skl2onnx>=1.14.0","onnxruntime>=1.7.0","torch>=1.8.1","pydot==1.3.0","importlib-resources==5.10.0",
-      "onnxmltools>=1.6.1","Pympler==0.9","docker==5.0.0","wget==3.2","PyJWT>=2.4.0","seaborn>=0.11.2","astunparse==1.6.3","shortuuid>=1.0.8","psutil>=5.9.1","pathlib>=1.0.1",
-      "protobuf>=3.20.1", "dill","scikeras"],
-    classifiers=[
-        "Programming Language :: Python :: 3",
-        "License :: Other/Proprietary License",
-        "Operating System :: OS Independent",
-    ],
-    python_requires='>=3.7',
-    include_package_data=True)
-