Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/codeproject/CodeProject.AI-…
Browse files Browse the repository at this point in the history 
…Server
  • Loading branch information
@ChrisMaunder
ChrisMaunder committed Dec 3, 2024
2 parents fa221cc + 28eb4fe commit 08c8e4c
Show file tree
Hide file tree
Showing 102 changed files with 1,917 additions and 1,201 deletions.
1 change: 1 addition & 0 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
###############################################################################
* text=auto
*.sh text eol=lf
*.bat text eol=crlf

###############################################################################
# Set default behavior for command prompt diff.
Expand Down
3 changes: 2 additions & 1 deletion .vscode/launch.docker.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@
},
"name": "ALPR",
"type": "python",
"python": "/app/modules/ALPR/bin/linux/python38/venv/bin/python",
// "python": "/app/modules/ALPR/bin/ubuntu/python38/venv/bin/python",
"python": "/app/modules/ALPR/bin/debian/python38/venv/bin/python",
"request": "launch",
"program": "ALPR_adapter.py",
"console": "integratedTerminal",
Expand Down
68 changes: 36 additions & 32 deletions .vscode/launch.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,12 @@
"request": "launch",
"preLaunchTask": "build-server",
// "postDebugTask": "stop-all",
"program": "${workspaceFolder}/src/server/bin/Debug/${env:dotNetTarget}/CodeProject.AI.Server",
"program": "${workspaceFolder}/src/server/bin/Debug/net9.0/CodeProject.AI.Server",
"linux": {
"program": "${workspaceFolder}/src/server/bin/Debug/${env:dotNetTarget}/CodeProject.AI.Server.dll",
// This is what you get from trusting ChatGPT
// "program": "${workspaceFolder}/src/server/bin/Debug/${env:dotNetTarget}/CodeProject.AI.Server.dll",
"program": "${workspaceFolder}/src/server/bin/Debug/net9.0/CodeProject.AI.Server.dll",

},
"args": [],
"cwd": "${workspaceFolder}/src/server/",
Expand Down Expand Up @@ -82,9 +85,9 @@
"request": "launch",
"preLaunchTask": "build-all",
// "postDebugTask": "stop-all",
"program": "${workspaceFolder}/src/server/bin/Debug/${env:dotNetTarget}/CodeProject.AI.Server",
"program": "${workspaceFolder}/src/server/bin/Debug/net9.0/CodeProject.AI.Server",
"linux": {
"program": "${workspaceFolder}/src/server/bin/Debug/${env:dotNetTarget}/CodeProject.AI.Server.dll",
"program": "${workspaceFolder}/src/server/bin/Debug/net9.0/CodeProject.AI.Server.dll",
},
"args": [],
"cwd": "${workspaceFolder}/src/server/",
Expand Down Expand Up @@ -138,9 +141,9 @@
"name": "Launch Server",
"type": "coreclr",
"request": "launch",
"program": "${workspaceFolder}/src/server/bin/Debug/${env:dotNetTarget}/CodeProject.AI.Server",
"program": "${workspaceFolder}/src/server/bin/Debug/net9.0/CodeProject.AI.Server",
"linux": {
"program": "${workspaceFolder}/src/server/bin/Debug/${env:dotNetTarget}/CodeProject.AI.Server.dll",
"program": "${workspaceFolder}/src/server/bin/Debug/net9.0/CodeProject.AI.Server.dll",
},
"args": [],
"cwd": "${workspaceFolder}/src/server/",
Expand Down Expand Up @@ -188,14 +191,14 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build-server",
"program": "${workspaceFolder}/src/server/bin/Debug/${env:dotNetTarget}/CodeProject.AI.Server.exe",
"program": "${workspaceFolder}/src/server/bin/Debug/net9.0/CodeProject.AI.Server.exe",
"linux": {
"program": "${workspaceFolder}/src/server/bin/Debug/${env:dotNetTarget}/CodeProject.AI.Server.dll",
"program": "${workspaceFolder}/src/server/bin/Debug/net9.0/CodeProject.AI.Server.dll",
},
"args": [
"--ModuleOptions:LaunchModules=false"
],
"cwd": "${workspaceFolder}/src/server/bin/Debug/${env:dotNetTarget}/",
"cwd": "${workspaceFolder}/src/server/bin/Debug/net9.0/",
"stopAtEntry": false,
/*
"serverReadyAction": {
Expand Down Expand Up @@ -230,9 +233,9 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build-yolo-net",
"program": "${workspaceFolder}/modules/ObjectDetectionYOLOv5Net/bin/Debug/${env:dotNetTarget}/ObjectDetectionYOLOv5Net",
"program": "${workspaceFolder}/modules/ObjectDetectionYOLOv5Net/bin/Debug/net9.0/ObjectDetectionYOLOv5Net.exe",
"linux": {
"program": "${workspaceFolder}/modules/ObjectDetectionYOLOv5Net/bin/Debug/${env:dotNetTarget}/ObjectDetectionYOLOv5Net.dll",
"program": "${workspaceFolder}/modules/ObjectDetectionYOLOv5Net/bin/Debug/net9.0/ObjectDetectionYOLOv5Net.dll",
},
// "args": [ "--selftest" ],
// "cwd": "${workspaceFolder}",
Expand All @@ -256,12 +259,13 @@
},
"name": "Object Detect YOLOv5 6.2",
"type": "debugpy",
"python": "${workspaceFolder}/runtimes/bin/linux/python38/venv/bin/python",
"python": "${workspaceFolder}/runtimes/bin/windows/python37/venv/Scripts/python",
"windows": {
"python": "${workspaceFolder}/runtimes/bin/windows/python37/venv/Scripts/python"
},
"linux": {
"python": "${workspaceFolder}/runtimes/bin/linux/python38/venv/bin/python",
"python": "${workspaceFolder}/runtimes/bin/ubuntu/python38/venv/bin/python",
// "python": "${workspaceFolder}/runtimes/bin/debian/python38/venv/bin/python",
},
"osx": {
"python": "${workspaceFolder}/runtimes/bin/macos/python38/venv/bin/python",
Expand Down Expand Up @@ -332,9 +336,9 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build-parsejson",
"program": "${workspaceFolder}/utils/ParseJSON/bin/Debug/${env:dotNetTarget}/ParseJSON",
"program": "${workspaceFolder}/utils/ParseJSON/bin/Debug/net9.0/ParseJSON",
"linux": {
"program": "${workspaceFolder}/utils/ParseJSON/bin/Debug/${env:dotNetTarget}/ParseJSON.dll",
"program": "${workspaceFolder}/utils/ParseJSON/bin/Debug/net9.0/ParseJSON.dll",
},
"args": [ "$.Modules.ALPR.Platforms", "test.json" ],
"cwd": "${workspaceFolder}/utils/ParseJSON/",
Expand Down Expand Up @@ -413,7 +417,7 @@
"program": "object-detect.exe",
"args": [ "run" ],
"cwd": "${workspaceFolder}/src/demos/clients/Rust/object-detect/target/debug",
"preLaunchTask": "build-deno-rust",
"preLaunchTask": "build-demo-rust",
"stopOnEntry": false,
"env": {
},
Expand Down Expand Up @@ -451,7 +455,7 @@
"request": "launch",
"preLaunchTask": "build-ai-explorer",
"windows": {
"program": "${workspaceFolder}/src/demos/clients/Net/AiExplorer/bin/Debug/${env:dotNetTarget}-windows/AiExplorer.exe",
"program": "${workspaceFolder}/src/demos/clients/Net/AiExplorer/bin/Debug/net9.0-windows/AiExplorer.exe",
},
"args": [],
"cwd": "${workspaceFolder}",
Expand All @@ -472,12 +476,9 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build-json-client",
"program": "${workspaceFolder}/src/demos/clients/Net/JsonAPI/bin/Debug/${env:dotNetTarget}/JsonAPI",
"program": "${workspaceFolder}/src/demos/clients/Net/JsonAPI/bin/Debug/net9.0/JsonAPI",
"linux": {
"program": "${workspaceFolder}/src/demos/clients/Net/JsonAPI/bin/Debug/${env:dotNetTarget}/JsonAPI.dll",
},
"osx": {
"program": "${workspaceFolder}/src/demos/clients/Net/JsonAPI/bin/Debug/${env:dotNetTarget}/JsonAPI.dll",
"program": "${workspaceFolder}/src/demos/clients/Net/JsonAPI/bin/Debug/net9.0/JsonAPI.dll",
},
"args": [],
"cwd": "${workspaceFolder}/src/demos/clients/Net/JsonAPI/",
Expand All @@ -501,7 +502,8 @@
"python": "${workspaceFolder}/runtimes/bin/windows/python39/venv/Scripts/python.exe"
},
"linux": {
"python": "${workspaceFolder}/runtimes/bin/linux/python38/venv/bin/python",
"python": "${workspaceFolder}/runtimes/bin/ubuntu/python38/venv/bin/python",
// "python": "${workspaceFolder}/runtimes/bin/debian/python38/venv/bin/python",
},
"osx": {
"python": "${workspaceFolder}/runtimes/bin/macos/python38/venv/bin/python",
Expand All @@ -528,12 +530,13 @@

"name": "Python Simple Module",
"type": "debugpy",
"python": "${workspaceFolder}/runtimes/bin/linux/python39/venv/bin/python",
"python": "${workspaceFolder}/runtimes/bin/windows/python39/venv/Scripts/python",
"windows": {
"python": "${workspaceFolder}/runtimes/bin/windows/python39/venv/Scripts/python"
},
"linux": {
"python": "${workspaceFolder}/runtimes/bin/linux/python38/venv/bin/python",
"python": "${workspaceFolder}/runtimes/bin/ubuntu/python38/venv/bin/python",
// "python": "${workspaceFolder}/runtimes/bin/debian/python38/venv/bin/python",
},
"osx": {
"python": "${workspaceFolder}/runtimes/bin/macos/python38/venv/bin/python",
Expand Down Expand Up @@ -563,12 +566,13 @@

"name": "Python Long Process Module",
"type": "debugpy",
"python": "${workspaceFolder}/runtimes/bin/linux/python39/venv/bin/python",
"python": "${workspaceFolder}/runtimes/bin/windows/python39/venv/Scripts/python",
"windows": {
"python": "${workspaceFolder}/runtimes/bin/windows/python39/venv/Scripts/python"
},
"linux": {
"python": "${workspaceFolder}/runtimes/bin/linux/python38/venv/bin/python",
"python": "${workspaceFolder}/runtimes/bin/ubuntu/python38/venv/bin/python",
// "python": "${workspaceFolder}/runtimes/bin/debian/python38/venv/bin/python",
},
"osx": {
"python": "${workspaceFolder}/runtimes/bin/macos/python38/venv/bin/python",
Expand Down Expand Up @@ -596,10 +600,10 @@
"name": ".NET Simple Module",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build-demo-net",
"program": "${workspaceFolder}/src/demos/modules/DotNetSimple/bin/Debug/${env:dotNetTarget}/DotNetSimple",
"preLaunchTask": "demo_module_dotnetsimple",
"program": "${workspaceFolder}/src/demos/modules/DotNetSimple/bin/Debug/net9.0/DotNetSimple",
"linux": {
"program": "${workspaceFolder}/src/demos/modules/DotNetSimple/bin/Debug/${env:dotNetTarget}/DotNetSimple.dll",
"program": "${workspaceFolder}/src/demos/modules/DotNetSimple/bin/Debug/net9.0/DotNetSimple.dll",
},
// "args": [ "--selftest" ],
// "cwd": "${workspaceFolder}",
Expand All @@ -624,9 +628,9 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build-demo_module_dotnetlongprocess",
"program": "${workspaceFolder}/src/demos/modules/DotNetLongProcess/bin/Debug/${env:dotNetTarget}/DotNetLongProcess",
"program": "${workspaceFolder}/src/demos/modules/DotNetLongProcess/bin/Debug/net9.0/DotNetLongProcess",
"linux": {
"program": "${workspaceFolder}/src/demos/modules/DotNetLongProcess/bin/Debug/${env:dotNetTarget}/DotNetLongProcess.dll",
"program": "${workspaceFolder}/src/demos/modules/DotNetLongProcess/bin/Debug/net9.0/DotNetLongProcess.dll",
},
// "args": [ "--selftest" ],
// "cwd": "${workspaceFolder}",
Expand Down
67 changes: 67 additions & 0 deletions .vscode/settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,43 +10,64 @@
"appsettings",
"argmax",
"Armv",
"arounds",
"ASKPASS",
"ASPNETCORE",
"astype",
"AUTOINSTALL",
"aync",
"BASEPATH",
"bitness",
"callbacktask",
"Cartooniser",
"categorised",
"chcp",
"codeproject",
"colour",
"colourised",
"colours",
"computecap",
"Consolas",
"consoleloggerparameters",
"CPAI",
"createallsubdirs",
"Crockford",
"Cuda",
"cuDNN",
"CUDNN",
"Darkmode",
"Denoising",
"denormalize",
"deserialise",
"deserialised",
"deserialising",
"deskew",
"Dgram",
"distutils",
"downloadables",
"downsampling",
"dtype",
"edgetpu",
"endtimer",
"ensurepip",
"errorlevel",
"Everytime",
"Expando",
"facerec",
"fbytes",
"fiftyone",
"fileglob",
"filesize",
"findstr",
"formdata",
"fouo",
"generalise",
"getframe",
"giga",
"gigaunit",
"gpuname",
"HKCU",
"HKLM",
"hostbuilder",
"hostnames",
"hyps",
Expand All @@ -66,17 +87,31 @@
"Jetson",
"keypair",
"keypoints",
"kilounit",
"labelledby",
"Lanczos",
"licence",
"LOCALAPPDATA",
"logicaldisk",
"logvals",
"lproj",
"maxs",
"megas",
"megaunit",
"membuffer",
"memfree",
"memsize",
"memtotal",
"memused",
"millidegree",
"moduleid",
"modulesettings",
"nbsp",
"NETBIOS",
"noheader",
"norestart",
"normalises",
"noscroll",
"nowait",
"nvcc",
"objectdetection",
Expand All @@ -87,54 +122,86 @@
"orangepi",
"otsu",
"paddleocr",
"parsejson",
"peasy",
"physmem",
"platenumber",
"pluralise",
"PMIC",
"popd",
"postinst",
"postprocess",
"prerm",
"pstree",
"pushd",
"pycoral",
"pypi",
"pyproj",
"pythonhosted",
"pywrap",
"Quadro",
"QUEUENAME",
"Radxa",
"radxarock",
"raspberrypi",
"rebalancing",
"RECOG",
"recognised",
"recursesubdirs",
"redist",
"redistributables",
"regpath",
"rembg",
"reqid",
"reqtype",
"reso",
"RKNN",
"Rockchip",
"rocm",
"rocminfo",
"runhidden",
"runtimes",
"safetensors",
"selftest",
"serversettings",
"setuptools",
"setx",
"shellexec",
"sideloaded",
"skia",
"Sonoma",
"standardise",
"starttimer",
"statuseseses",
"subshell",
"Systemmd",
"Tegra",
"tegrastats",
"tempstore",
"tera",
"teras",
"teraunit",
"textreader",
"tflite",
"topbanner",
"torchvision",
"totalspacebytes",
"tpus",
"ufeff",
"unclip",
"uninstallexe",
"upsampling",
"usebackq",
"userid",
"usermem",
"utilisation",
"utilise",
"vcgencmd",
"venv",
"vggish",
"waitretry",
"wavfile",
"winget",
"womp",
"wslconfig",
"wwwroot",
Expand Down
Loading

0 comments on commit 08c8e4c

Please sign in to comment.