deal with new zenodo api

bioimage-io · Oct 31, 2023 · e2ca634 · e2ca634
1 parent 290e5f7
commit e2ca634
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 5 deletions.
diff --git a/src/main/java/io/bioimage/modelrunner/bioimageio/description/weights/KerasWeights.java b/src/main/java/io/bioimage/modelrunner/bioimageio/description/weights/KerasWeights.java
@@ -155,7 +155,13 @@ public void setSha256(Object s) {
 	 * {@inheritDoc}
 	 */
 	public String getSource() {
-		return source;
+		if (source != null && 
+				source.startsWith(Constants.ZENODO_DOMAIN) 
+				&& source.endsWith(Constants.ZENODO_ANNOYING_SUFFIX))
+			return source.substring(0, 
+					source.length() - Constants.ZENODO_ANNOYING_SUFFIX.length());
+		else
+			return source;
 	}
 
 	/**

diff --git a/src/main/java/io/bioimage/modelrunner/bioimageio/description/weights/OnnxWeights.java b/src/main/java/io/bioimage/modelrunner/bioimageio/description/weights/OnnxWeights.java
@@ -178,7 +178,13 @@ public void setSha256(Object s) {
 	 * {@inheritDoc}
 	 */
 	public String getSource() {
-		return source;
+		if (source != null && 
+				source.startsWith(Constants.ZENODO_DOMAIN) 
+				&& source.endsWith(Constants.ZENODO_ANNOYING_SUFFIX))
+			return source.substring(0, 
+					source.length() - Constants.ZENODO_ANNOYING_SUFFIX.length());
+		else
+			return source;
 	}
 
 	/**

diff --git a/src/main/java/io/bioimage/modelrunner/bioimageio/description/weights/TfJsWeights.java b/src/main/java/io/bioimage/modelrunner/bioimageio/description/weights/TfJsWeights.java
@@ -155,7 +155,13 @@ public void setSha256(Object s) {
 	 * {@inheritDoc}
 	 */
 	public String getSource() {
-		return source;
+		if (source != null && 
+				source.startsWith(Constants.ZENODO_DOMAIN) 
+				&& source.endsWith(Constants.ZENODO_ANNOYING_SUFFIX))
+			return source.substring(0, 
+					source.length() - Constants.ZENODO_ANNOYING_SUFFIX.length());
+		else
+			return source;
 	}
 
 	/**

diff --git a/src/main/java/io/bioimage/modelrunner/bioimageio/description/weights/TfWeights.java b/src/main/java/io/bioimage/modelrunner/bioimageio/description/weights/TfWeights.java
@@ -25,6 +25,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import io.bioimage.modelrunner.utils.Constants;
 import io.bioimage.modelrunner.versionmanagement.SupportedVersions;
 
 /**
@@ -173,7 +174,13 @@ public void setSha256(Object s) {
 	 * {@inheritDoc}
 	 */
 	public String getSource() {
-		return source;
+		if (source != null && 
+				source.startsWith(Constants.ZENODO_DOMAIN) 
+				&& source.endsWith(Constants.ZENODO_ANNOYING_SUFFIX))
+			return source.substring(0, 
+					source.length() - Constants.ZENODO_ANNOYING_SUFFIX.length());
+		else
+			return source;
 	}
 
 	/**

diff --git a/src/main/java/io/bioimage/modelrunner/bioimageio/description/weights/TorchscriptWeights.java b/src/main/java/io/bioimage/modelrunner/bioimageio/description/weights/TorchscriptWeights.java
@@ -180,7 +180,13 @@ public void setSha256(Object s) {
 	 * {@inheritDoc}
 	 */
 	public String getSource() {
-		return source;
+		if (source != null && 
+				source.startsWith(Constants.ZENODO_DOMAIN) 
+				&& source.endsWith(Constants.ZENODO_ANNOYING_SUFFIX))
+			return source.substring(0, 
+					source.length() - Constants.ZENODO_ANNOYING_SUFFIX.length());
+		else
+			return source;
 	}
 
 	/**