Merge branch 'main' into fixWindowsConf

Tyler-Odenthal · web-flow · commit 212b21179b06 · 2023-04-07T08:31:26.000-07:00
diff --git a/roboflow/config.py b/roboflow/config.py
@@ -25,6 +25,7 @@ def get_conditional_configuration_variable(key, default):
     conf_location = os.getenv(
         "ROBOFLOW_CONFIG_DIR",
         default=default_path,
+
     )
 
     # read config file for roboflow if logged in from python or CLI
diff --git a/roboflow/core/version.py b/roboflow/core/version.py
@@ -570,7 +570,7 @@ def deploy(self, model_type: str, model_path: str) -> None:
                         )
 
         res = requests.get(
-            f"{API_URL}/{self.workspace}/{self.project}/{self.version}/uploadModel?api_key={self.__api_key}&modelType={model_type}"
+            f"{API_URL}/{self.workspace}/{self.project}/{self.version}/uploadModel?api_key={self.__api_key}&modelType={model_type}&nocache=true"
         )
         try:
             if res.status_code == 429:

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ def get_conditional_configuration_variable(key, default):`
`25`	`25`	`conf_location = os.getenv(`
`26`	`26`	`"ROBOFLOW_CONFIG_DIR",`
`27`	`27`	`default=default_path,`
	`28`	`+`
`28`	`29`	`)`
`29`	`30`
`30`	`31`	`# read config file for roboflow if logged in from python or CLI`
Original file line number	Diff line number	Diff line change
`@@ -570,7 +570,7 @@ def deploy(self, model_type: str, model_path: str) -> None:`
`570`	`570`	`)`
`571`	`571`
`572`	`572`	`res = requests.get(`
`573`		`- f"{API_URL}/{self.workspace}/{self.project}/{self.version}/uploadModel?api_key={self.__api_key}&modelType={model_type}"`
	`573`	`+ f"{API_URL}/{self.workspace}/{self.project}/{self.version}/uploadModel?api_key={self.__api_key}&modelType={model_type}&nocache=true"`
`574`	`574`	`)`
`575`	`575`	`try:`
`576`	`576`	`if res.status_code == 429:`