Skip to content

Commit f534b39

Browse files
dreamer-codingdreamer-coding
authored
Merge pull request #34 from dreamer-coding/main
New hashing algorithm with some sea salt
2 parents 3ee8b25 + 201b474 commit f534b39

File tree

8 files changed

+1104
-1093
lines changed

8 files changed

+1104
-1093
lines changed

‎.github/workflows/meson_ci.yml‎

Lines changed: 13 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,13 @@ on:
55
paths:
66
- "**.c"
77
- "**.h"
8-
- "**.cpp"
9-
- "**.hpp"
108
- "**.py"
119
- "**.build"
1210
- "**.options"
1311
pull_request:
1412
paths:
1513
- "**.c"
1614
- "**.h"
17-
- "**.cpp"
18-
- "**.hpp"
1915
- "**.py"
2016
- "**.build"
2117
- "**.options"
@@ -26,7 +22,7 @@ jobs:
2622
runs-on: windows-latest
2723
strategy:
2824
matrix:
29-
msvc_version: [2015, 2017, 2019, 2022]
25+
msvc_version: [2015, 2017, 2019, 2022, 2025]
3026
steps:
3127
- name: Checkout code
3228
uses: actions/checkout@v4
@@ -51,25 +47,17 @@ jobs:
5147
choco install visualstudio2019buildtools --package-parameters "--add Microsoft.VisualStudio.Workload.VCTools --includeRecommended --includeOptional --passive"
5248
} elseif ($env:msvc_version -eq "2022") {
5349
choco install visualstudio2022buildtools --package-parameters "--add Microsoft.VisualStudio.Workload.VCTools --includeRecommended --includeOptional --passive"
50+
} elseif ($env:msvc_version -eq "2025") {
51+
choco install visualstudio2025buildtools --package-parameters "--add Microsoft.VisualStudio.Workload.VCTools --includeRecommended --includeOptional --passive"
5452
}
5553
$env:CC="cl.exe"
5654
$env:CXX="cl.exe"
5755
5856
- name: Configure
5957
run: meson setup builddir_msvc_${{ matrix.msvc_version }} --fatal-meson-warnings -Dwerror=true -Dwith_test=enabled -Dwarning_level=3
6058

61-
- name: Compile
62-
run: meson compile -C builddir_msvc_${{ matrix.msvc_version }}
63-
6459
- name: Run Tests
65-
run: meson test -C builddir_msvc_${{ matrix.msvc_version }} -v
66-
67-
- name: Upload Test Log
68-
if: failure()
69-
uses: actions/upload-artifact@v4
70-
with:
71-
name: windows_msvc_${{ matrix.msvc_version }}_meson_testlog
72-
path: builddir_msvc_${{ matrix.msvc_version }}/meson-logs/testlog.txt
60+
run: meson test -C builddir_msvc_${{ matrix.msvc_version }} -v --test-args='show --mode tree --verbose ci --result fail'
7361

7462
build_macosx:
7563
name: Building on macOS with Xcode ${{ matrix.xcode_version }}
@@ -98,18 +86,8 @@ jobs:
9886
- name: Configure
9987
run: meson setup builddir --fatal-meson-warnings -Dwerror=true -Dwith_test=enabled -Dwarning_level=3
10088

101-
- name: Compile
102-
run: meson compile -C builddir
103-
10489
- name: Run Tests
105-
run: meson test -C builddir -v
106-
107-
- name: Upload Test Log
108-
if: failure()
109-
uses: actions/upload-artifact@v4
110-
with:
111-
name: macos_xcode_${{ matrix.xcode_version }}_meson_testlog
112-
path: builddir/meson-logs/testlog.txt
90+
run: meson test -C builddir -v --test-args='show --mode tree --verbose ci --result fail'
11391

11492
build_msys:
11593
name: Building on MSYS ${{ matrix.architecture }}
@@ -145,18 +123,8 @@ jobs:
145123
- name: Configure
146124
run: meson setup builddir --fatal-meson-warnings -Dwerror=true -Dwith_test=enabled -Dwarning_level=3
147125

148-
- name: Compile
149-
run: meson compile -C builddir
150-
151126
- name: Run Tests
152-
run: meson test -C builddir -v
153-
154-
- name: Upload Test Log
155-
if: failure()
156-
uses: actions/upload-artifact@v4
157-
with:
158-
name: msys_${{ matrix.architecture }}_meson_testlog
159-
path: builddir/meson-logs/testlog.txt
127+
run: meson test -C builddir -v --test-args='show --mode tree --verbose ci --result fail'
160128

161129
build_mingw:
162130
name: Building on MinGW ${{ matrix.architecture }}
@@ -196,18 +164,8 @@ jobs:
196164
- name: Configure
197165
run: meson setup builddir --fatal-meson-warnings -Dwerror=true -Dwith_test=enabled -Dwarning_level=3
198166

199-
- name: Compile
200-
run: meson compile -C builddir
201-
202167
- name: Run Tests
203-
run: meson test -C builddir -v
204-
205-
- name: Upload Test Log
206-
if: failure()
207-
uses: actions/upload-artifact@v4
208-
with:
209-
name: mingw_${{ matrix.architecture }}_meson_testlog
210-
path: builddir/meson-logs/testlog.txt
168+
run: meson test -C builddir -v --test-args='show --mode tree --verbose ci --result fail'
211169

212170
build_posix:
213171
name: Build on Linux ${{ matrix.distro }}
@@ -249,8 +207,7 @@ jobs:
249207
/bin/bash -c "
250208
sudo apt update
251209
meson setup builddir --fatal-meson-warnings -Dwerror=true -Dwith_test=enabled -Dwarning_level=3
252-
meson compile -C builddir
253-
meson test -C builddir -v"
210+
meson test -C builddir -v --test-args='show --mode tree --verbose ci --result fail'"
254211
255212
build_cross:
256213
name: Building on Bedrock ${{ matrix.architecture }}
@@ -344,4 +301,8 @@ jobs:
344301
345302
- name: Build the Project
346303
run: |
347-
meson compile -C builddir
304+
meson compile -C builddir
305+
306+
- name: Test the Project
307+
run: |
308+
meson test -C builddir -v --test-args='show --mode tree --verbose ci --result fail'

‎README.md‎

Lines changed: 60 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,41 @@ Jellyfish is a lightweight, portable AI library written in pure C with no extern
66

77
This file defines a **Jellyfish mindset**, mapping named personalities to model chains (`.fish` files):
88

9-
```meson
10-
# This is the primary logic bundle for TAI personality
11-
12-
mindset('core_logic') {
13-
description: 'Fundamental AI building blocks'
9+
```ini
10+
model('core_logic') {
11+
description: 'Fundamental AI reasoning and logic modules'
12+
tags: ['core', 'logic', 'reasoning']
13+
models: ['logic.fish', 'nlp.fish', 'ethics.fish']
1414
priority: 1
15-
models: [
16-
'logic.fish',
17-
'nlp.fish',
18-
'ethics.fish'
19-
]
20-
tags: ['core']
21-
confidence_threshold: 0.5
22-
23-
#:bootstrap
24-
#:taint-free
15+
confidence_threshold: 0.75
16+
activation_condition: 'always'
17+
source_uri: 'https://fossillogic.ai/models/core_logic'
18+
origin_device_id: '00:1A:7D:DA:71:13'
19+
version: '1.0.0'
20+
content_hash: 'a3f5c7d89b4e1f23a567b9d0c1e2f3456789abcdef0123456789abcdef012345'
21+
created_at: 1689004800
22+
updated_at: 1689091200
23+
trust_score: 0.98
24+
immutable: 1
25+
state_machine: 'logic_state_v1'
2526
}
2627

27-
# Another mindset with conditional loading
28-
mindset('persona_trump') {
29-
description: 'Simulates Donald Trump speech pattern'
30-
models: ['trump_speech.fish']
31-
activation_condition: 'input contains "Trump"'
32-
priority: 10
33-
#:persona
28+
model('persona_trump') {
29+
description: 'Personality model for Donald Trump simulation'
30+
tags: ['persona', 'politics', 'simulation']
31+
models: ['trump_brain.fish', 'debate_logic.fish']
32+
priority: 5
33+
confidence_threshold: 0.6
34+
activation_condition: 'user_request == "trump_mode"'
35+
source_uri: 'https://fossillogic.ai/models/persona_trump'
36+
origin_device_id: '00:1B:44:11:3A:B7'
37+
version: '2.1.4'
38+
content_hash: 'b1a2c3d4e5f60718293a4b5c6d7e8f90123456789abcdef0123456789abcdef0'
39+
created_at: 1689000000
40+
updated_at: 1689050000
41+
trust_score: 0.85
42+
immutable: 0
43+
state_machine: 'persona_v2'
3444
}
3545
```
3646

@@ -51,17 +61,41 @@ A `.fish` file stores learned associations (called *thought blocks*) in JSON for
5161
{
5262
"input": "fire",
5363
"output": "hot",
54-
"timestamp": 1620000000
64+
"hash": "b1946ac92492d2347c6235b4d2611184",
65+
"timestamp": 1620000000,
66+
"delta_ms": 0,
67+
"duration_ms": 12,
68+
"valid": 1,
69+
"confidence": 0.98,
70+
"usage_count": 5,
71+
"device_id": "a1b2c3d4e5f6a7b8",
72+
"signature": "00112233445566778899aabbccddeeff"
5573
},
5674
{
5775
"input": "ice",
5876
"output": "cold",
59-
"timestamp": 1620001000
77+
"hash": "e4da3b7fbbce2345d7772b0674a318d5",
78+
"timestamp": 1620001000,
79+
"delta_ms": 1000,
80+
"duration_ms": 10,
81+
"valid": 1,
82+
"confidence": 0.95,
83+
"usage_count": 3,
84+
"device_id": "a1b2c3d4e5f6a7b8",
85+
"signature": "00112233445566778899aabbccddeeff"
6086
},
6187
{
6288
"input": "wind",
6389
"output": "fast",
64-
"timestamp": 1620002000
90+
"hash": "1679091c5a880faf6fb5e6087eb1b2dc",
91+
"timestamp": 1620002000,
92+
"delta_ms": 1000,
93+
"duration_ms": 8,
94+
"valid": 1,
95+
"confidence": 0.92,
96+
"usage_count": 2,
97+
"device_id": "a1b2c3d4e5f6a7b8",
98+
"signature": "00112233445566778899aabbccddeeff"
6599
}
66100
]
67101
}
@@ -105,7 +139,7 @@ To get started with Jellyfish, ensure you have the following installed:
105139
# ======================
106140
[wrap-git]
107141
url = https://github.com/fossillogic/fossil-jellyfish.git
108-
revision = v0.1.0
142+
revision = v0.1.1
109143

110144
[provide]
111145
fossil-jellyfish = fossil_fish_dep

0 commit comments

Comments
 (0)