Update identifier validation logic for run method (#55)

* Align run identifier validation with Docker naming rules

* Add test for calling run with invalid identifiers

* Add test for running with identifier containing hyphen and full stop

Author: mattt

index.js

@@ -81,10 +81,18 @@ class Replicate {
    * @returns {Promise<object>} - Resolves with the output of running the model
    */
   async run(identifier, options) {
-    const pattern =
-      /^(?<owner>[a-zA-Z0-9-_]+?)\/(?<name>[a-zA-Z0-9-_]+?):(?<version>[0-9a-fA-F]+)$/;
-    const match = identifier.match(pattern);
+    // Define a pattern for owner and model names that allows
+    // letters, digits, and certain special characters.
+    // Example: "user123", "abc__123", "user.name"
+    const namePattern = /[a-zA-Z0-9]+(?:(?:[._]|__|[-]*)[a-zA-Z0-9]+)*/;
+
+    // Define a pattern for "owner/name:version" format with named capturing groups.
+    // Example: "user123/repo_a:1a2b3c"
+    const pattern = new RegExp(
+      `^(?<owner>${namePattern.source})/(?<name>${namePattern.source}):(?<version>[0-9a-fA-F]+)$`
+    );
 
+    const match = identifier.match(pattern);
     if (!match || !match.groups) {
       throw new Error(
         'Invalid version. It must be in the format "owner/name:version"'

index.test.ts

@@ -426,6 +426,37 @@ describe('Replicate client', () => {
       );
       expect(output).toBe('foobar');
     });
+
+    test('Does not throw an error for identifier containing hyphen and full stop', async () => {
+      nock(BASE_URL)
+        .post('/predictions')
+        .reply(200, {
+          id: 'ufawqhfynnddngldkgtslldrkq',
+          status: 'processing',
+        })
+        .get('/predictions/ufawqhfynnddngldkgtslldrkq')
+        .reply(200, {
+          id: 'ufawqhfynnddngldkgtslldrkq',
+          status: 'succeeded',
+          output: 'foobar',
+        });
+
+      await expect(client.run('a/b-1.0:abc123', { input: { text: 'Hello, world!' } })).resolves.not.toThrow();
+    });
+
+    test('Throws an error for invalid identifiers', async () => {
+      const options = { input: { text: 'Hello, world!' } }
+
+      await expect(client.run('owner/model:invalid', options)).rejects.toThrow();
+
+      // @ts-expect-error
+      await expect(client.run('owner:abc123', options)).rejects.toThrow();
+
+      await expect(client.run('/model:abc123', options)).rejects.toThrow();
+
+      // @ts-expect-error
+      await expect(client.run(':abc123', options)).rejects.toThrow();
+    });
   });
 
   // Continue with tests for other methods