Tom Chapin
							
						 | 
						
							
							
							
							
							
								
							
							
								4ea0d0f841
								
							
						 | 
						
							
							
								
								Merge branch 'main' into feature/debug-logging
							
							
							
							
							
							
							
							# Conflicts:
#	OS/01/conversations/user.json
#	OS/01/device.py 
							
						 | 
						
							2024-02-10 16:07:54 -08:00 | 
						
					
				
					
						
							
							
								 
								Tom Chapin
							
						 | 
						
							
							
							
							
							
								
							
							
								0c234277c3
								
							
						 | 
						
							
							
								
								Adding standard python logging support
							
							
							
							
							
						 | 
						
							2024-02-10 15:56:40 -08:00 | 
						
					
				
					
						
							
							
								 
								killian
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								65acb1163f
								
							
						 | 
						
							
							
								
								Merge pull request #12 from zachwe/zach-cleaner-start
							
							
							
							
							
							
							
							Improve startup script 
							
						 | 
						
							2024-02-10 15:55:00 -08:00 | 
						
					
				
					
						
							
							
								 
								killian
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								ec761b5686
								
							
						 | 
						
							
							
								
								Merge pull request #13 from birbbit/hb/save_computer_msg
							
							
							
							
							
							
							
							save computer message + misc fixes 
							
						 | 
						
							2024-02-10 15:40:34 -08:00 | 
						
					
				
					
						
							
							
								 
								birbbit
							
						 | 
						
							
							
							
							
							
								
							
							
								510749a629
								
							
						 | 
						
							
							
								
								save computer message + misc fixes
							
							
							
							
							
						 | 
						
							2024-02-10 15:33:37 -08:00 | 
						
					
				
					
						
							
							
								 
								Zach Wener
							
						 | 
						
							
							
							
							
							
								
							
							
								2b48e2f4a3
								
							
						 | 
						
							
							
								
								cleanup
							
							
							
							
							
						 | 
						
							2024-02-10 15:27:34 -08:00 | 
						
					
				
					
						
							
							
								 
								Zach Wener
							
						 | 
						
							
							
							
							
							
								
							
							
								4cd3c77a3e
								
							
						 | 
						
							
							
								
								Make it easier to stop services
							
							
							
							
							
						 | 
						
							2024-02-10 15:25:41 -08:00 | 
						
					
				
					
						
							
							
								 
								Tom Chapin
							
						 | 
						
							
							
							
							
							
								
							
							
								4277b35f31
								
							
						 | 
						
							
							
								
								Removing user conversations from github repo
							
							
							
							
							
						 | 
						
							2024-02-10 15:05:50 -08:00 | 
						
					
				
					
						
							
							
								 
								killian
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								87c5dd40cb
								
							
						 | 
						
							
							
								
								Merge pull request #11 from shivenmian/u/shivenmian/local
							
							
							
							
							
							
							
							Integrated local whisper.cpp 
							
						 | 
						
							2024-02-10 14:53:00 -08:00 | 
						
					
				
					
						
							
							
								 
								Shiven Mian
							
						 | 
						
							
							
							
							
							
								
							
							
								c9b3608b38
								
							
						 | 
						
							
							
								
								nit: remove temp output file
							
							
							
							
							
						 | 
						
							2024-02-10 11:49:08 -08:00 | 
						
					
				
					
						
							
							
								 
								Shiven Mian
							
						 | 
						
							
							
							
							
							
								
							
							
								43108e931d
								
							
						 | 
						
							
							
								
								fix accidental gitignore add
							
							
							
							
							
						 | 
						
							2024-02-10 11:36:08 -08:00 | 
						
					
				
					
						
							
							
								 
								Shiven Mian
							
						 | 
						
							
							
							
							
							
								
							
							
								9ce3540672
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/main' into u/shivenmian/local
							
							
							
							
							
						 | 
						
							2024-02-10 11:32:33 -08:00 | 
						
					
				
					
						
							
							
								 
								Shiven Mian
							
						 | 
						
							
							
							
							
							
								
							
							
								23123dc549
								
							
						 | 
						
							
							
								
								chore: integrated local whisper + restructuring
							
							
							
							
							
						 | 
						
							2024-02-10 11:29:41 -08:00 | 
						
					
				
					
						
							
							
								 
								killian
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								80ec3f1667
								
							
						 | 
						
							
							
								
								Update README.md
							
							
							
							
							
						 | 
						
							2024-02-10 03:33:18 -08:00 | 
						
					
				
					
						
							
							
								 
								killian
							
						 | 
						
							
							
							
							
							
								
							
							
								d362bcd8a8
								
							
						 | 
						
							
							
								
								13 Days
							
							
							
							
							
						 | 
						
							2024-02-10 03:30:36 -08:00 | 
						
					
				
					
						
							
							
								 
								Shiven Mian
							
						 | 
						
							
							
							
							
							
								
							
							
								12df8bbfac
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'zakiui/u/zabirauf/stt-py' into u/shivenmian/local
							
							
							
							
							
						 | 
						
							2024-02-10 03:18:12 -08:00 | 
						
					
				
					
						
							
							
								 
								killian
							
						 | 
						
							
							
							
							
							
								
							
							
								08cfa9e523
								
							
						 | 
						
							
							
								
								Check for computer messages
							
							
							
							
							
						 | 
						
							2024-02-10 03:01:41 -08:00 | 
						
					
				
					
						
							
							
								 
								killian
							
						 | 
						
							
							
							
							
							
								
							
							
								375192afe6
								
							
						 | 
						
							
							
								
								Ready for whisper
							
							
							
							
							
						 | 
						
							2024-02-09 23:45:58 -08:00 | 
						
					
				
					
						
							
							
								 
								killian
							
						 | 
						
							
							
							
							
							
								
							
							
								6a96670460
								
							
						 | 
						
							
							
								
								TASKS.md
							
							
							
							
							
						 | 
						
							2024-02-09 23:08:48 -08:00 | 
						
					
				
					
						
							
							
								 
								killian
							
						 | 
						
							
							
							
							
							
								
							
							
								c69d9ce662
								
							
						 | 
						
							
							
								
								TASKS.md
							
							
							
							
							
						 | 
						
							2024-02-09 22:57:58 -08:00 | 
						
					
				
					
						
							
							
								 
								killian
							
						 | 
						
							
							
							
							
							
								
							
							
								2743743e5e
								
							
						 | 
						
							
							
								
								Added install directions
							
							
							
							
							
						 | 
						
							2024-02-09 21:23:55 -08:00 | 
						
					
				
					
						
							
							
								 
								killian
							
						 | 
						
							
							
							
							
							
								
							
							
								defb613227
								
							
						 | 
						
							
							
								
								Added install directions
							
							
							
							
							
						 | 
						
							2024-02-09 21:21:37 -08:00 | 
						
					
				
					
						
							
							
								 
								killian
							
						 | 
						
							
							
							
							
							
								
							
							
								777ab42f75
								
							
						 | 
						
							
							
								
								8th Architecture
							
							
							
							
							
						 | 
						
							2024-02-08 23:46:33 -08:00 | 
						
					
				
					
						
							
							
								 
								killian
							
						 | 
						
							
							
							
							
							
								
							
							
								d0857f7170
								
							
						 | 
						
							
							
								
								8th Architecture
							
							
							
							
							
						 | 
						
							2024-02-08 19:34:50 -08:00 | 
						
					
				
					
						
							
							
								 
								killian
							
						 | 
						
							
							
							
							
							
								
							
							
								2a603581b5
								
							
						 | 
						
							
							
								
								8th Architecture
							
							
							
							
							
						 | 
						
							2024-02-08 19:27:52 -08:00 | 
						
					
				
					
						
							
							
								 
								killian
							
						 | 
						
							
							
							
							
							
								
							
							
								47b31fb5e1
								
							
						 | 
						
							
							
								
								8th Architecture
							
							
							
							
							
						 | 
						
							2024-02-08 18:37:23 -08:00 | 
						
					
				
					
						
							
							
								 
								killian
							
						 | 
						
							
							
							
							
							
								
							
							
								e75fa90a48
								
							
						 | 
						
							
							
								
								8th Architecture
							
							
							
							
							
						 | 
						
							2024-02-08 16:50:32 -08:00 | 
						
					
				
					
						
							
							
								 
								killian
							
						 | 
						
							
							
							
							
							
								
							
							
								61dd64f469
								
							
						 | 
						
							
							
								
								`bash OS/01/start.sh`
							
							
							
							
							
						 | 
						
							2024-02-08 13:00:18 -08:00 | 
						
					
				
					
						
							
							
								 
								killian
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								64fc5285fb
								
							
						 | 
						
							
							
								
								Update README.md
							
							
							
							
							
						 | 
						
							2024-02-08 10:12:55 -08:00 | 
						
					
				
					
						
							
							
								 
								killian
							
						 | 
						
							
							
							
							
							
								
							
							
								699a69321b
								
							
						 | 
						
							
							
								
								`bash OS/01/start.sh`
							
							
							
							
							
						 | 
						
							2024-02-04 05:22:01 -08:00 | 
						
					
				
					
						
							
							
								 
								killian
							
						 | 
						
							
							
							
							
							
								
							
							
								5c9c0d780f
								
							
						 | 
						
							
							
								
								`bash OS/01/start.sh`
							
							
							
							
							
						 | 
						
							2024-02-04 02:46:20 -08:00 | 
						
					
				
					
						
							
							
								 
								killian
							
						 | 
						
							
							
							
							
							
								
							
							
								525fa27ceb
								
							
						 | 
						
							
							
								
								`bash OS/01/start.sh`
							
							
							
							
							
						 | 
						
							2024-02-04 02:44:20 -08:00 | 
						
					
				
					
						
							
							
								 
								killian
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								43d3c4e266
								
							
						 | 
						
							
							
								
								Merge pull request #9 from shivenmian/u/shivenmian/user
							
							
							
							
							
							
							
							feat: tts works! 
							
						 | 
						
							2024-02-04 00:42:35 -08:00 | 
						
					
				
					
						
							
							
								 
								Shiven Mian
							
						 | 
						
							
							
							
							
							
								
							
							
								bb8da14e8a
								
							
						 | 
						
							
							
								
								feat: tts
							
							
							
							
							
						 | 
						
							2024-02-04 00:40:58 -08:00 | 
						
					
				
					
						
							
							
								 
								killian
							
						 | 
						
							
							
							
							
							
								
							
							
								556ca38e4f
								
							
						 | 
						
							
							
								
								Error handling
							
							
							
							
							
						 | 
						
							2024-02-03 23:55:57 -08:00 | 
						
					
				
					
						
							
							
								 
								killian
							
						 | 
						
							
							
							
							
							
								
							
							
								a4fcac8926
								
							
						 | 
						
							
							
								
								little things
							
							
							
							
							
						 | 
						
							2024-02-03 23:43:40 -08:00 | 
						
					
				
					
						
							
							
								 
								killian
							
						 | 
						
							
							
							
							
							
								
							
							
								63ab616082
								
							
						 | 
						
							
							
								
								Two way websocket in user + settings
							
							
							
							
							
						 | 
						
							2024-02-03 23:32:55 -08:00 | 
						
					
				
					
						
							
							
								 
								Shiven Mian
							
						 | 
						
							
							
							
							
							
								
							
							
								0fa932cb06
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/main' into u/shivenmian/user
							
							
							
							
							
						 | 
						
							2024-02-03 20:39:40 -08:00 | 
						
					
				
					
						
							
							
								 
								Shiven Mian
							
						 | 
						
							
							
							
							
							
								
							
							
								50259751d9
								
							
						 | 
						
							
							
								
								feat: added tts model
							
							
							
							
							
						 | 
						
							2024-02-03 20:37:09 -08:00 | 
						
					
				
					
						
							
							
								 
								killian
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								5f7d53f0b9
								
							
						 | 
						
							
							
								
								Merge pull request #8 from birbbit/hb/locally_running
							
							
							
							
							
							
							
							runs locally 
							
						 | 
						
							2024-02-03 20:36:03 -08:00 | 
						
					
				
					
						
							
							
								 
								birbbit
							
						 | 
						
							
							
							
							
							
								
							
							
								062d288d33
								
							
						 | 
						
							
							
								
								runs locally
							
							
							
							
							
						 | 
						
							2024-02-03 20:35:28 -08:00 | 
						
					
				
					
						
							
							
								 
								killian
							
						 | 
						
							
							
							
							
							
								
							
							
								a9196c6f2a
								
							
						 | 
						
							
							
								
								start script
							
							
							
							
							
						 | 
						
							2024-02-03 20:09:01 -08:00 | 
						
					
				
					
						
							
							
								 
								killian
							
						 | 
						
							
							
							
							
							
								
							
							
								92e39b2432
								
							
						 | 
						
							
							
								
								start scripts
							
							
							
							
							
						 | 
						
							2024-02-03 20:06:27 -08:00 | 
						
					
				
					
						
							
							
								 
								killian
							
						 | 
						
							
							
							
							
							
								
							
							
								da87851e80
								
							
						 | 
						
							
							
								
								listen > assistant
							
							
							
							
							
						 | 
						
							2024-02-03 20:05:03 -08:00 | 
						
					
				
					
						
							
							
								 
								killian
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								c5590871a6
								
							
						 | 
						
							
							
								
								Merge pull request #7 from shivenmian/osxscript
							
							
							
							
							
							
							
							feat: added OSX start script 
							
						 | 
						
							2024-02-03 19:59:02 -08:00 | 
						
					
				
					
						
							
							
								 
								Shiven Mian
							
						 | 
						
							
							
							
							
							
								
							
							
								c276927724
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'tom/feature/enable-osx-support' into osxscript
							
							
							
							
							
						 | 
						
							2024-02-03 19:53:29 -08:00 | 
						
					
				
					
						
							
							
								 
								killian
							
						 | 
						
							
							
							
							
							
								
							
							
								9f1efb5680
								
							
						 | 
						
							
							
								
								a new start
							
							
							
							
							
						 | 
						
							2024-02-03 19:40:28 -08:00 | 
						
					
				
					
						
							
							
								 
								killian
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								6e130d42ea
								
							
						 | 
						
							
							
								
								Merge pull request #6 from shivenmian/u/shivenmian/user
							
							
							
							
							
							
							
							feat: add user.py with record + whisper stt 
							
						 | 
						
							2024-02-03 19:32:14 -08:00 | 
						
					
				
					
						
							
							
								 
								Shiven Mian
							
						 | 
						
							
							
							
							
							
								
							
							
								5f1be31562
								
							
						 | 
						
							
							
								
								fix: add back user.py docstring
							
							
							
							
							
						 | 
						
							2024-02-03 19:30:55 -08:00 | 
						
					
				
					
						
							
							
								 
								Shiven Mian
							
						 | 
						
							
							
							
							
							
								
							
							
								9e5fe73fba
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/main' into u/shivenmian/user
							
							
							
							
							
						 | 
						
							2024-02-03 19:26:27 -08:00 |