From 285098e4d8401e98716d3d4ecf5e3092c45a6264 Mon Sep 17 00:00:00 2001
From: carlosuc3m <100329787@alumnos.uc3m.es>
Date: Thu, 2 Nov 2023 02:47:51 +0100
Subject: [PATCH] revert incorrect changes

---
 .../bioimageio/description/weights/KerasWeights.java     | 8 +-------
 .../bioimageio/description/weights/OnnxWeights.java      | 9 +--------
 .../bioimageio/description/weights/PytorchWeights.java   | 8 +-------
 .../bioimageio/description/weights/TfJsWeights.java      | 8 +-------
 .../bioimageio/description/weights/TfWeights.java        | 8 +-------
 .../description/weights/TorchscriptWeights.java          | 8 +-------
 .../bioimageio/description/weights/WeightFormat.java     | 4 ++--
 .../modelrunner/bioimageio/download/DownloadModel.java   | 2 +-
 8 files changed, 9 insertions(+), 46 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
index fc402f2c..f5449722 100644
--- 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,13 +155,7 @@ public void setSha256(Object s) {
 	 * {@inheritDoc}
 	 */
 	public String getSource() {
-		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;
+		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
index a0604384..bd66cd69 100644
--- a/src/main/java/io/bioimage/modelrunner/bioimageio/description/weights/OnnxWeights.java
+++ b/src/main/java/io/bioimage/modelrunner/bioimageio/description/weights/OnnxWeights.java
@@ -170,7 +170,6 @@ public String getSha256() {
 	public void setSha256(Object s) {
 		if (s instanceof String)
 			sha256 = (String) s;
-		
 	}
 
 	@Override
@@ -178,13 +177,7 @@ public void setSha256(Object s) {
 	 * {@inheritDoc}
 	 */
 	public String getSource() {
-		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;
+		return source;
 	}
 	
 	/**
diff --git a/src/main/java/io/bioimage/modelrunner/bioimageio/description/weights/PytorchWeights.java b/src/main/java/io/bioimage/modelrunner/bioimageio/description/weights/PytorchWeights.java
index 238a2b22..1d9111b1 100644
--- a/src/main/java/io/bioimage/modelrunner/bioimageio/description/weights/PytorchWeights.java
+++ b/src/main/java/io/bioimage/modelrunner/bioimageio/description/weights/PytorchWeights.java
@@ -155,13 +155,7 @@ public void setSha256(Object s) {
 	 * {@inheritDoc}
 	 */
 	public String getSource() {
-		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;
+		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
index 076226ca..52d98871 100644
--- 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,13 +155,7 @@ public void setSha256(Object s) {
 	 * {@inheritDoc}
 	 */
 	public String getSource() {
-		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;
+		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
index a6966051..ee3ac423 100644
--- a/src/main/java/io/bioimage/modelrunner/bioimageio/description/weights/TfWeights.java
+++ b/src/main/java/io/bioimage/modelrunner/bioimageio/description/weights/TfWeights.java
@@ -174,13 +174,7 @@ public void setSha256(Object s) {
 	 * {@inheritDoc}
 	 */
 	public String getSource() {
-		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;
+		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
index 83cb24c6..9c553a3c 100644
--- 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,13 +180,7 @@ public void setSha256(Object s) {
 	 * {@inheritDoc}
 	 */
 	public String getSource() {
-		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;
+		return source;
 	}
 	
 	/**
diff --git a/src/main/java/io/bioimage/modelrunner/bioimageio/description/weights/WeightFormat.java b/src/main/java/io/bioimage/modelrunner/bioimageio/description/weights/WeightFormat.java
index 368c4691..1f900024 100644
--- a/src/main/java/io/bioimage/modelrunner/bioimageio/description/weights/WeightFormat.java
+++ b/src/main/java/io/bioimage/modelrunner/bioimageio/description/weights/WeightFormat.java
@@ -75,8 +75,8 @@ public interface WeightFormat {
 	public String getSha256();
 	
 	/**
-	 * REturn URL to the weights in the local machine
-	 * @return URL to the weights in the local machine
+	 * REturn the String defined in the Bioimage.io rdf.yaml file as the weigths source
+	 * @return the String defined in the Bioimage.io rdf.yaml file as the weigths source
 	 */
 	public String getSource();
 	
diff --git a/src/main/java/io/bioimage/modelrunner/bioimageio/download/DownloadModel.java b/src/main/java/io/bioimage/modelrunner/bioimageio/download/DownloadModel.java
index c1ae599d..2637b34c 100644
--- a/src/main/java/io/bioimage/modelrunner/bioimageio/download/DownloadModel.java
+++ b/src/main/java/io/bioimage/modelrunner/bioimageio/download/DownloadModel.java
@@ -512,7 +512,7 @@ private void unzipTfWeights() throws IOException {
 	 * @throws MalformedURLException if the String does not correspond to an URL
 	 */
 	public static String getFileNameFromURLString(String str) throws MalformedURLException {
-		if (str.startsWith(Constants.ZENODO_DOMAIN))
+		if (str.startsWith(Constants.ZENODO_DOMAIN) && str.endsWith(Constants.ZENODO_ANNOYING_SUFFIX))
 			str = str.substring(0, str.length() - Constants.ZENODO_ANNOYING_SUFFIX.length());
 		URL url = new URL(str);
 		return new File(url.getPath()).getName();