Merge pull request justadudewhohacks#69 from bmaguireibm/master

justadudewhohacks · web-flow · commit 47a54b57b7b3 · 2018-08-13T12:52:35.000+02:00
Adding support for external model uris
diff --git a/src/commons/loadWeightMap.ts b/src/commons/loadWeightMap.ts
@@ -16,14 +16,16 @@ export function getModelUris(uri: string | undefined, defaultModelName: string)
       manifestUri: `/${defaultManifestFilename}`
     }
   }
+  const protocol = uri.startsWith('http://') ? 'http://' : uri.startsWith('https://') ? 'https://' : '';
+  uri = uri.replace(protocol, '');
 
   const parts = uri.split('/').filter(s => s)
 
   const manifestFile = uri.endsWith('.json')
     ? parts[parts.length - 1]
     : defaultManifestFilename
 
-  let modelBaseUri = (uri.endsWith('.json') ? parts.slice(0, parts.length - 1) : parts).join('/')
+  let modelBaseUri = protocol + (uri.endsWith('.json') ? parts.slice(0, parts.length - 1) : parts).join('/')
   modelBaseUri = uri.startsWith('/') ? `/${modelBaseUri}` : modelBaseUri
 
   return {
diff --git a/test/tests/commons/loadWeightMap.test.ts b/test/tests/commons/loadWeightMap.test.ts
@@ -59,6 +59,14 @@ describe('loadWeightMap', () => {
       expect(result.modelBaseUri).toEqual('/path/to/modelfiles')
     })
 
+    it('returns correct uris, given external path', () => {
+      const uri = 'https://example.com/path/to/modelfiles/';
+      const result = getModelUris(uri, FAKE_DEFAULT_MODEL_NAME)
+
+      expect(result.manifestUri).toEqual(uri + 'model-weights_manifest.json')
+      expect(result.modelBaseUri).toEqual(uri)
+    })
+
   })
 
 })

Original file line number	Diff line number	Diff line change
`@@ -16,14 +16,16 @@ export function getModelUris(uri: string \| undefined, defaultModelName: string)`
`16`	`16`	manifestUri: `/${defaultManifestFilename}`
`17`	`17`	`}`
`18`	`18`	`}`
	`19`	`+ const protocol = uri.startsWith('http://') ? 'http://' : uri.startsWith('https://') ? 'https://' : '';`
	`20`	`+ uri = uri.replace(protocol, '');`
`19`	`21`
`20`	`22`	`const parts = uri.split('/').filter(s => s)`
`21`	`23`
`22`	`24`	`const manifestFile = uri.endsWith('.json')`
`23`	`25`	`? parts[parts.length - 1]`
`24`	`26`	`: defaultManifestFilename`
`25`	`27`
`26`		`- let modelBaseUri = (uri.endsWith('.json') ? parts.slice(0, parts.length - 1) : parts).join('/')`
	`28`	`+ let modelBaseUri = protocol + (uri.endsWith('.json') ? parts.slice(0, parts.length - 1) : parts).join('/')`
`27`	`29`	modelBaseUri = uri.startsWith('/') ? `/${modelBaseUri}` : modelBaseUri
`28`	`30`
`29`	`31`	`return {`