Merge pull request #20 from thekevinscott/ks/rename-package

Rename package to contort
thekevinscott · Apr 4, 2024 · f70740b · f70740b
2 parents 42fce71 + 51cc715
commit f70740b
Show file tree

Hide file tree

Showing 75 changed files with 20 additions and 20 deletions.
diff --git a/.deepsource.toml b/.deepsource.toml
@@ -1,13 +1,13 @@
 version = 1
 
 test_patterns = [
-  "packages/contortionist/src/**/*.ts",
+  "packages/contort/src/**/*.ts",
   "packages/contort/src/**/*.ts",
 ]
 
 exclude_patterns = [
-  "packages/contortionist/src/**/*.test.ts", 
-  "packages/contortionist/test/**/*.ts", 
+  "packages/contort/src/**/*.test.ts", 
+  "packages/contort/test/**/*.ts", 
   "packages/contort/src/**/*.test.ts", 
   "packages/contort/test/**/*.ts", 
   # "examples/**", 

diff --git a/.github/workflows/publish-npm.yaml b/.github/workflows/publish-npm.yaml
@@ -36,14 +36,14 @@ jobs:
             ${{ runner.os }}-pnpm-store-
 
       - name: Install dependencies
-        working-directory: ./packages/contortionist
+        working-directory: ./packages/contort
         run: pnpm install
 
       - name: Build package
-        working-directory: ./packages/contortionist
+        working-directory: ./packages/contort
         run: pnpm build
 
       - run: pnpm publish --no-git-checks
-        working-directory: ./packages/contortionist
+        working-directory: ./packages/contort
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -35,11 +35,11 @@ jobs:
             ${{ runner.os }}-pnpm-store-
 
       - name: Install dependencies
-        working-directory: ./packages/contortionist
+        working-directory: ./packages/contort
         run: pnpm install
 
       - name: 'Lint'
-        working-directory: ./packages/contortionist
+        working-directory: ./packages/contort
         run: 'pnpm lint'
 
   unit-test:
@@ -75,11 +75,11 @@ jobs:
             ${{ runner.os }}-pnpm-store-
 
       - name: Install dependencies
-        working-directory: ./packages/contortionist
+        working-directory: ./packages/contort
         run: pnpm install
 
       - name: 'Test'
-        working-directory: ./packages/contortionist
+        working-directory: ./packages/contort
         run: 'pnpm test'
 
       - name: Upload coverage reports to Codecov
@@ -121,13 +121,13 @@ jobs:
             ${{ runner.os }}-pnpm-store-
 
       - name: Install dependencies
-        working-directory: ./packages/contortionist
+        working-directory: ./packages/contort
         run: pnpm install
 
       - name: 'Build'
-        working-directory: ./packages/contortionist
+        working-directory: ./packages/contort
         run: 'pnpm build'
 
       - name: 'Check build output'
-        working-directory: ./packages/contortionist
+        working-directory: ./packages/contort
         run: 'pnpm build:check'
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 <a href="https://codecov.io/gh/thekevinscott/contortionist"><img alt="Code Coverage for contortionist" src="https://img.shields.io/codecov/c/github/thekevinscott/contortionist" /></a>
 <a href="https://deepsource.io/gh/thekevinscott/contortionist/?ref=repository-badge"><img alt="DeepSource issues for contortionist" src="https://deepsource.io/gh/thekevinscott/contortionist.svg/?label=active+issues&show_trend=true" /></a>
 
-![alt text](./packages/contortionist/assets/eye.webp)
+![alt text](./packages/contort/assets/eye.webp)
 
 Control what LLMs can, and can't, say.
 

diff --git a/dev/browser/generate/index.ts b/dev/browser/generate/index.ts
@@ -1,6 +1,6 @@
 import { pipeline } from '@xenova/transformers';
 // import { PreTrainedModel, TextGenerationConfig, TextGenerationPipeline, } from "@xenova/transformers";
-import Contortionist from '../../../packages/contortionist/src/index.js';
+import Contortionist from '../../../packages/contort/src/index.js';
 import '@vanillawc/wc-monaco-editor';
 const grammars = import.meta.glob('./grammars/*.gbnf', {
   eager: true,

diff --git a/dev/browser/types/index.ts b/dev/browser/types/index.ts
@@ -1,4 +1,4 @@
-import { Contortionist } from "../../../packages/contortionist/src/contortionist.js";
+import { Contortionist } from "../../../packages/contort/src/contortionist.js";
 
 const contortionllamafileNonStreaming = new Contortionist({ grammar: 'g', model: { endpoint: 'a', protocol: 'llamafile', }, });
 contortionllamafileNonStreaming.execute('p', {

diff --git a/dev/node/package.json b/dev/node/package.json
@@ -12,7 +12,7 @@
       "command": "tsc -p ./tsconfig.json",
       "dependencies": [
         "../../packages/codesynth:build",
-        "../../packages/contortionist:build"
+        "../../packages/contort:build"
       ],
       "files": [
         "src/**/*.ts",

diff --git a/packages/contortionist/.eslintrc.cjs → packages/contort/.eslintrc.cjs b/packages/contortionist/.eslintrc.cjs → packages/contort/.eslintrc.cjs
diff --git a/packages/contortionist/.gitignore → packages/contort/.gitignore b/packages/contortionist/.gitignore → packages/contort/.gitignore
diff --git a/packages/contortionist/.npmignore → packages/contort/.npmignore b/packages/contortionist/.npmignore → packages/contort/.npmignore
diff --git a/packages/contortionist/LICENSE → packages/contort/LICENSE b/packages/contortionist/LICENSE → packages/contort/LICENSE
diff --git a/packages/contortionist/assets/eye.webp → packages/contort/assets/eye.webp b/packages/contortionist/assets/eye.webp → packages/contort/assets/eye.webp
diff --git a/packages/contortionist/package.json → packages/contort/package.json b/packages/contortionist/package.json → packages/contort/package.json
@@ -1,7 +1,7 @@
 {
   "name": "contort",
   "type": "module",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "repository": {
     "type": "git",
     "url": "https://github.com/thekevinscott/contortionist.git"

diff --git a/packages/contortionist/src/contortionist.ts → packages/contort/src/contortionist.ts b/packages/contortionist/src/contortionist.ts → packages/contort/src/contortionist.ts
diff --git a/packages/contortionist/src/global.d.ts → packages/contort/src/global.d.ts b/packages/contortionist/src/global.d.ts → packages/contort/src/global.d.ts
diff --git a/packages/contortionist/src/index.ts → packages/contort/src/index.ts b/packages/contortionist/src/index.ts → packages/contort/src/index.ts
diff --git a/...endpoint-llms/fetch-api/fetch-api.test.ts → ...endpoint-llms/fetch-api/fetch-api.test.ts b/...endpoint-llms/fetch-api/fetch-api.test.ts → ...endpoint-llms/fetch-api/fetch-api.test.ts
diff --git a/...llms/endpoint-llms/fetch-api/fetch-api.ts → ...llms/endpoint-llms/fetch-api/fetch-api.ts b/...llms/endpoint-llms/fetch-api/fetch-api.ts → ...llms/endpoint-llms/fetch-api/fetch-api.ts
diff --git a/...point-llms/fetch-api/parse-stream.test.ts → ...point-llms/fetch-api/parse-stream.test.ts b/...point-llms/fetch-api/parse-stream.test.ts → ...point-llms/fetch-api/parse-stream.test.ts
diff --git a/...s/endpoint-llms/fetch-api/parse-stream.ts → ...s/endpoint-llms/fetch-api/parse-stream.ts b/...s/endpoint-llms/fetch-api/parse-stream.ts → ...s/endpoint-llms/fetch-api/parse-stream.ts
diff --git a/...ortionist/src/llms/endpoint-llms/index.ts → ...s/contort/src/llms/endpoint-llms/index.ts b/...ortionist/src/llms/endpoint-llms/index.ts → ...s/contort/src/llms/endpoint-llms/index.ts
diff --git a/...p/__fixtures__/make-llama-cpp-response.ts → ...p/__fixtures__/make-llama-cpp-response.ts b/...p/__fixtures__/make-llama-cpp-response.ts → ...p/__fixtures__/make-llama-cpp-response.ts
diff --git a/...int-llms/llama-cpp/build-response.test.ts → ...int-llms/llama-cpp/build-response.test.ts b/...int-llms/llama-cpp/build-response.test.ts → ...int-llms/llama-cpp/build-response.test.ts
diff --git a/...endpoint-llms/llama-cpp/build-response.ts → ...endpoint-llms/llama-cpp/build-response.ts b/...endpoint-llms/llama-cpp/build-response.ts → ...endpoint-llms/llama-cpp/build-response.ts
diff --git a/.../endpoint-llms/llama-cpp/is-error.test.ts → .../endpoint-llms/llama-cpp/is-error.test.ts b/.../endpoint-llms/llama-cpp/is-error.test.ts → .../endpoint-llms/llama-cpp/is-error.test.ts
diff --git a/.../llms/endpoint-llms/llama-cpp/is-error.ts → .../llms/endpoint-llms/llama-cpp/is-error.ts b/.../llms/endpoint-llms/llama-cpp/is-error.ts → .../llms/endpoint-llms/llama-cpp/is-error.ts
diff --git a/...oint-llms/llama-cpp/llama-cpp-llm.test.ts → ...oint-llms/llama-cpp/llama-cpp-llm.test.ts b/...oint-llms/llama-cpp/llama-cpp-llm.test.ts → ...oint-llms/llama-cpp/llama-cpp-llm.test.ts
diff --git a/.../endpoint-llms/llama-cpp/llama-cpp-llm.ts → .../endpoint-llms/llama-cpp/llama-cpp-llm.ts b/.../endpoint-llms/llama-cpp/llama-cpp-llm.ts → .../endpoint-llms/llama-cpp/llama-cpp-llm.ts
diff --git a/...dpoint-llms/llama-cpp/parse-chunk.test.ts → ...dpoint-llms/llama-cpp/parse-chunk.test.ts b/...dpoint-llms/llama-cpp/parse-chunk.test.ts → ...dpoint-llms/llama-cpp/parse-chunk.test.ts
diff --git a/...ms/endpoint-llms/llama-cpp/parse-chunk.ts → ...ms/endpoint-llms/llama-cpp/parse-chunk.ts b/...ms/endpoint-llms/llama-cpp/parse-chunk.ts → ...ms/endpoint-llms/llama-cpp/parse-chunk.ts
diff --git a/...lms/endpoint-llms/llama-cpp/parse.test.ts → ...lms/endpoint-llms/llama-cpp/parse.test.ts b/...lms/endpoint-llms/llama-cpp/parse.test.ts → ...lms/endpoint-llms/llama-cpp/parse.test.ts
diff --git a/...src/llms/endpoint-llms/llama-cpp/parse.ts → ...src/llms/endpoint-llms/llama-cpp/parse.ts b/...src/llms/endpoint-llms/llama-cpp/parse.ts → ...src/llms/endpoint-llms/llama-cpp/parse.ts
diff --git a/...src/llms/endpoint-llms/llama-cpp/types.ts → ...src/llms/endpoint-llms/llama-cpp/types.ts b/...src/llms/endpoint-llms/llama-cpp/types.ts → ...src/llms/endpoint-llms/llama-cpp/types.ts
diff --git a/...e/__fixtures__/make-llamafile-response.ts → ...e/__fixtures__/make-llamafile-response.ts b/...e/__fixtures__/make-llamafile-response.ts → ...e/__fixtures__/make-llamafile-response.ts
diff --git a/...int-llms/llamafile/build-response.test.ts → ...int-llms/llamafile/build-response.test.ts b/...int-llms/llamafile/build-response.test.ts → ...int-llms/llamafile/build-response.test.ts
diff --git a/...endpoint-llms/llamafile/build-response.ts → ...endpoint-llms/llamafile/build-response.ts b/...endpoint-llms/llamafile/build-response.ts → ...endpoint-llms/llamafile/build-response.ts
diff --git a/...dpoint-llms/llamafile/get-content.test.ts → ...dpoint-llms/llamafile/get-content.test.ts b/...dpoint-llms/llamafile/get-content.test.ts → ...dpoint-llms/llamafile/get-content.test.ts
diff --git a/...ms/endpoint-llms/llamafile/get-content.ts → ...ms/endpoint-llms/llamafile/get-content.ts b/...ms/endpoint-llms/llamafile/get-content.ts → ...ms/endpoint-llms/llamafile/get-content.ts
diff --git a/...point-llms/llamafile/get-messages.test.ts → ...point-llms/llamafile/get-messages.test.ts b/...point-llms/llamafile/get-messages.test.ts → ...point-llms/llamafile/get-messages.test.ts
diff --git a/...s/endpoint-llms/llamafile/get-messages.ts → ...s/endpoint-llms/llamafile/get-messages.ts b/...s/endpoint-llms/llamafile/get-messages.ts → ...s/endpoint-llms/llamafile/get-messages.ts
diff --git a/.../endpoint-llms/llamafile/is-error.test.ts → .../endpoint-llms/llamafile/is-error.test.ts b/.../endpoint-llms/llamafile/is-error.test.ts → .../endpoint-llms/llamafile/is-error.test.ts
diff --git a/.../llms/endpoint-llms/llamafile/is-error.ts → .../llms/endpoint-llms/llamafile/is-error.ts b/.../llms/endpoint-llms/llamafile/is-error.ts → .../llms/endpoint-llms/llamafile/is-error.ts
diff --git a/...oint-llms/llamafile/llamafile-llm.test.ts → ...oint-llms/llamafile/llamafile-llm.test.ts b/...oint-llms/llamafile/llamafile-llm.test.ts → ...oint-llms/llamafile/llamafile-llm.test.ts
diff --git a/.../endpoint-llms/llamafile/llamafile-llm.ts → .../endpoint-llms/llamafile/llamafile-llm.ts b/.../endpoint-llms/llamafile/llamafile-llm.ts → .../endpoint-llms/llamafile/llamafile-llm.ts
diff --git a/...dpoint-llms/llamafile/parse-chunk.test.ts → ...dpoint-llms/llamafile/parse-chunk.test.ts b/...dpoint-llms/llamafile/parse-chunk.test.ts → ...dpoint-llms/llamafile/parse-chunk.test.ts
diff --git a/...ms/endpoint-llms/llamafile/parse-chunk.ts → ...ms/endpoint-llms/llamafile/parse-chunk.ts b/...ms/endpoint-llms/llamafile/parse-chunk.ts → ...ms/endpoint-llms/llamafile/parse-chunk.ts
diff --git a/...lms/endpoint-llms/llamafile/parse.test.ts → ...lms/endpoint-llms/llamafile/parse.test.ts b/...lms/endpoint-llms/llamafile/parse.test.ts → ...lms/endpoint-llms/llamafile/parse.test.ts
diff --git a/...src/llms/endpoint-llms/llamafile/parse.ts → ...src/llms/endpoint-llms/llamafile/parse.ts b/...src/llms/endpoint-llms/llamafile/parse.ts → ...src/llms/endpoint-llms/llamafile/parse.ts
diff --git a/...src/llms/endpoint-llms/llamafile/types.ts → ...src/llms/endpoint-llms/llamafile/types.ts b/...src/llms/endpoint-llms/llamafile/types.ts → ...src/llms/endpoint-llms/llamafile/types.ts
diff --git a/...ortionist/src/llms/endpoint-llms/types.ts → ...s/contort/src/llms/endpoint-llms/types.ts b/...ortionist/src/llms/endpoint-llms/types.ts → ...s/contort/src/llms/endpoint-llms/types.ts
diff --git a/...es/contortionist/src/llms/get-llm.test.ts → packages/contort/src/llms/get-llm.test.ts b/...es/contortionist/src/llms/get-llm.test.ts → packages/contort/src/llms/get-llm.test.ts
diff --git a/packages/contortionist/src/llms/get-llm.ts → packages/contort/src/llms/get-llm.ts b/packages/contortionist/src/llms/get-llm.ts → packages/contort/src/llms/get-llm.ts
diff --git a/packages/contortionist/src/llms/index.ts → packages/contort/src/llms/index.ts b/packages/contortionist/src/llms/index.ts → packages/contort/src/llms/index.ts
diff --git a/...s/contortionist/src/llms/js-llms/index.ts → packages/contort/src/llms/js-llms/index.ts b/...s/contortionist/src/llms/js-llms/index.ts → packages/contort/src/llms/js-llms/index.ts
diff --git a/...ansformersjs-llm/__fixtures__/callable.ts → ...ansformersjs-llm/__fixtures__/callable.ts b/...ansformersjs-llm/__fixtures__/callable.ts → ...ansformersjs-llm/__fixtures__/callable.ts
diff --git a/...rmersjs-llm/__fixtures__/mock-pipeline.ts → ...rmersjs-llm/__fixtures__/mock-pipeline.ts b/...rmersjs-llm/__fixtures__/mock-pipeline.ts → ...rmersjs-llm/__fixtures__/mock-pipeline.ts
diff --git a/...llm/__fixtures__/mock-pretrained-model.ts → ...llm/__fixtures__/mock-pretrained-model.ts b/...llm/__fixtures__/mock-pretrained-model.ts → ...llm/__fixtures__/mock-pretrained-model.ts
diff --git a/...__fixtures__/mock-pretrained-tokenizer.ts → ...__fixtures__/mock-pretrained-tokenizer.ts b/...__fixtures__/mock-pretrained-tokenizer.ts → ...__fixtures__/mock-pretrained-tokenizer.ts
diff --git a/...mersjs-llm/__fixtures__/mock-tokenizer.ts → ...mersjs-llm/__fixtures__/mock-tokenizer.ts b/...mersjs-llm/__fixtures__/mock-tokenizer.ts → ...mersjs-llm/__fixtures__/mock-tokenizer.ts
diff --git a/...ersjs-llm/__fixtures__/mock-vocab-trie.ts → ...ersjs-llm/__fixtures__/mock-vocab-trie.ts b/...ersjs-llm/__fixtures__/mock-vocab-trie.ts → ...ersjs-llm/__fixtures__/mock-vocab-trie.ts
diff --git a/.../llms/js-llms/transformersjs-llm/index.ts → .../llms/js-llms/transformersjs-llm/index.ts b/.../llms/js-llms/transformersjs-llm/index.ts → .../llms/js-llms/transformersjs-llm/index.ts
diff --git a/...ansformersjs-llm/logits-processor.test.ts → ...ansformersjs-llm/logits-processor.test.ts b/...ansformersjs-llm/logits-processor.test.ts → ...ansformersjs-llm/logits-processor.test.ts
diff --git a/...ms/transformersjs-llm/logits-processor.ts → ...ms/transformersjs-llm/logits-processor.ts b/...ms/transformersjs-llm/logits-processor.ts → ...ms/transformersjs-llm/logits-processor.ts
diff --git a/...llms/transformersjs-llm/tokenizer.test.ts → ...llms/transformersjs-llm/tokenizer.test.ts b/...llms/transformersjs-llm/tokenizer.test.ts → ...llms/transformersjs-llm/tokenizer.test.ts
diff --git a/...s/js-llms/transformersjs-llm/tokenizer.ts → ...s/js-llms/transformersjs-llm/tokenizer.ts b/...s/js-llms/transformersjs-llm/tokenizer.ts → ...s/js-llms/transformersjs-llm/tokenizer.ts
diff --git a/...sformersjs-llm/transformersjs-llm.test.ts → ...sformersjs-llm/transformersjs-llm.test.ts b/...sformersjs-llm/transformersjs-llm.test.ts → ...sformersjs-llm/transformersjs-llm.test.ts
diff --git a/.../transformersjs-llm/transformersjs-llm.ts → .../transformersjs-llm/transformersjs-llm.ts b/.../transformersjs-llm/transformersjs-llm.ts → .../transformersjs-llm/transformersjs-llm.ts
diff --git a/.../llms/js-llms/transformersjs-llm/types.ts → .../llms/js-llms/transformersjs-llm/types.ts b/.../llms/js-llms/transformersjs-llm/types.ts → .../llms/js-llms/transformersjs-llm/types.ts
diff --git a/.../js-llms/transformersjs-llm/vocab-trie.ts → .../js-llms/transformersjs-llm/vocab-trie.ts b/.../js-llms/transformersjs-llm/vocab-trie.ts → .../js-llms/transformersjs-llm/vocab-trie.ts
diff --git a/packages/contortionist/src/types.ts → packages/contort/src/types.ts b/packages/contortionist/src/types.ts → packages/contort/src/types.ts
diff --git a/packages/contortionist/src/utils.ts → packages/contort/src/utils.ts b/packages/contortionist/src/utils.ts → packages/contort/src/utils.ts
diff --git a/packages/contortionist/tsconfig.json → packages/contort/tsconfig.json b/packages/contortionist/tsconfig.json → packages/contort/tsconfig.json
diff --git a/packages/contortionist/tsconfig.test.json → packages/contort/tsconfig.test.json b/packages/contortionist/tsconfig.test.json → packages/contort/tsconfig.test.json
diff --git a/packages/contortionist/vite.config.ts → packages/contort/vite.config.ts b/packages/contortionist/vite.config.ts → packages/contort/vite.config.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml