From ccc928ed136bac04fb5cadee13540a654c7df86e Mon Sep 17 00:00:00 2001 From: CongwangLi <47933502+jackkkkklee@users.noreply.github.com> Date: Sun, 22 Oct 2023 11:33:56 +0800 Subject: [PATCH] Fix filename resolve (#9) Co-authored-by: LCW --- .../plugins/dragonfly/config/ObjectStorageConfig.java | 2 +- .../serve/plugins/dragonfly/utils/DragonflyUtils.java | 6 +++--- .../serve/plugins/dragonfly/utils/ModelRegisterUtils.java | 8 +++++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/pytorch/serve/plugins/dragonfly/config/ObjectStorageConfig.java b/src/main/java/org/pytorch/serve/plugins/dragonfly/config/ObjectStorageConfig.java index 4498553..4c021c0 100644 --- a/src/main/java/org/pytorch/serve/plugins/dragonfly/config/ObjectStorageConfig.java +++ b/src/main/java/org/pytorch/serve/plugins/dragonfly/config/ObjectStorageConfig.java @@ -48,7 +48,7 @@ public class ObjectStorageConfig { private String serviceAccountPath; // Endpoint of OSS. - @SerializedName("end_point") + @SerializedName("endpoint") private String endPoint; // Access key ID of OSS. diff --git a/src/main/java/org/pytorch/serve/plugins/dragonfly/utils/DragonflyUtils.java b/src/main/java/org/pytorch/serve/plugins/dragonfly/utils/DragonflyUtils.java index 8db6a75..6371c25 100644 --- a/src/main/java/org/pytorch/serve/plugins/dragonfly/utils/DragonflyUtils.java +++ b/src/main/java/org/pytorch/serve/plugins/dragonfly/utils/DragonflyUtils.java @@ -165,16 +165,16 @@ private void initConfig() { if (configPath == null) { String osType = System.getProperty("os.name").toUpperCase(); if (osType.contains("LINUX")) { - configPath = linuxDefaultConfigPath ; + configPath = linuxDefaultConfigPath + "/" + configFileName ; } else if (osType.contains("MAC")) { - configPath = System.getProperty("user.home") + darwinDefaultConfigPath ; + configPath = System.getProperty("user.home") + darwinDefaultConfigPath + "/" + configFileName ; } else { logger.error("do not support os type :" + osType); } } try { Gson gson = new Gson(); - JsonReader reader = new JsonReader(new FileReader(configPath + "/" + configFileName)); + JsonReader reader = new JsonReader(new FileReader(configPath)); dragonflyEndpointConfig = gson.fromJson(reader, DragonflyEndpointConfig.class); objectStorageConfig = dragonflyEndpointConfig.getObjectStorageConfig(); } catch (JsonParseException e) { diff --git a/src/main/java/org/pytorch/serve/plugins/dragonfly/utils/ModelRegisterUtils.java b/src/main/java/org/pytorch/serve/plugins/dragonfly/utils/ModelRegisterUtils.java index 4136faa..d54adfc 100644 --- a/src/main/java/org/pytorch/serve/plugins/dragonfly/utils/ModelRegisterUtils.java +++ b/src/main/java/org/pytorch/serve/plugins/dragonfly/utils/ModelRegisterUtils.java @@ -72,11 +72,13 @@ public StatusResponse downLoadAndRegisterModel(DragonflyModelRequest dragonflyMo if (modelStore == null) { throw new ModelNotFoundException("Model store has not been configured."); } - File modelLocation = new File(modelStore, fileName); - // download file by dragonfly + //download file by dragonfly + String[] nameArray = fileName.split("/"); + String stripedFileName = nameArray[nameArray.length - 1]; + File modelLocation = new File(modelStore, stripedFileName); fileLoadUtil.copyURLToFile(fileName, modelLocation); - // register model + //register model String modelName = dragonflyModelRequest.getModelName(); String runtime = dragonflyModelRequest.getRuntime(); String handler = dragonflyModelRequest.getHandler();