Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
7820bc4
Switch TA3 client to 'main' branch rather than 'development'
dmjoy May 6, 2024
7b67c76
Add initial oracle ADM
eveenhuis Apr 17, 2024
9ef159f
Upate poetry.lock
dmjoy Jun 6, 2024
f38b4a0
Initial cut at input-output file based interface
dmjoy May 8, 2024
fd8e985
Prevent ADMs from modifying original action objects
dmjoy May 8, 2024
ed8925c
Update CHANGELOG
dmjoy Jun 6, 2024
103062d
Add Apache 2.0 license
brianhhu Jun 12, 2024
4e77e58
Add Acknowledgments and Disclaimer
dmjoy Jun 12, 2024
299fe3b
Working hydra based driver script
dmjoy Jun 12, 2024
f66759b
Add accuracy measure to input-output interface
dmjoy Jun 14, 2024
91e79d2
Add more complete set of metrics to input-output interface
dmjoy Jun 17, 2024
3cdd285
Interface tweaks, add configs and example input output files
dmjoy Jun 18, 2024
8732d38
Add remaining alignment targets
dmjoy Jun 18, 2024
48014d2
Add remaining configs for metrics eval systems
dmjoy Jun 18, 2024
048525b
Remove no longer needed import
dmjoy Jun 20, 2024
30c5349
Update README; move/replace deprecated run_align_system script
dmjoy Jun 20, 2024
b9fecf2
Updated README regarding run output directory
dmjoy Jun 20, 2024
ce3ce4c
Misc fixes for CLI
dmjoy Jun 20, 2024
ef89413
Add missing configs/__init__.py file
dmjoy Jun 21, 2024
c5bca61
Fixup README and add default output dir to .gitignore
dmjoy Jun 25, 2024
5137070
Move configs into align_system module (bugfix for non-editable installs)
dmjoy Jun 25, 2024
a35927f
Update changelog for 0.4.0 release
dmjoy Jun 25, 2024
bcd72ae
Update README to cover how to create a new ADM
dmjoy Jun 28, 2024
c821135
Add section to README regarding scoring output
dmjoy Jun 28, 2024
3f1461b
Fix printing logging
cfunk1210 Feb 28, 2024
453ba6d
In progress
cfunk1210 Mar 1, 2024
9439355
First working cut of incontext learning
cfunk1210 Mar 2, 2024
56ee349
updating incontex for saying example
cfunk1210 Mar 6, 2024
9dae035
Updated to use an external dataset for incontext. Right now using th…
cfunk1210 Apr 29, 2024
c912f88
WIP: getting incontext examples with tokens
cfunk1210 Apr 29, 2024
52bf5a2
Updated incontext examples to be like the assistent and also now abou…
cfunk1210 May 6, 2024
e025112
Added Incontext learning dataset update
cfunk1210 May 20, 2024
5db0204
Adding more about the incontext learning (adding to previous commit)
cfunk1210 May 20, 2024
b0dcabd
Adding configs for different testing (high, low, incontext, and basel…
cfunk1210 May 20, 2024
494f9ee
Adding more configs
cfunk1210 May 22, 2024
23c8370
Using Choice name
cfunk1210 Jun 4, 2024
7202196
Adding low moral text
cfunk1210 Jun 4, 2024
7d94a80
Additional error checking
eveenhuis Jun 26, 2024
0cc183b
Remove reference to moral deservingness
eveenhuis Jul 2, 2024
e7b11d4
Add incontext hydra configs
eveenhuis Jul 3, 2024
755c50d
Update vscode launch file
eveenhuis Jul 3, 2024
03c6776
Include results directory in gitignore
eveenhuis Jul 3, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
run.bash

venv/
__pycache__/
__pycache__/
outputs
results
106 changes: 106 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "High Incontext Adept",
"type": "debugpy",
"request": "launch",
"console": "integratedTerminal",
"module": "align_system.cli.run_align_system",
"args": [
"loglevel=\"DEBUG\"",
"+experiment=metrics_refinement_evaluation/single_kdma_aligned_adept_high",
"adm=incontext/moral_deservingness",
"adm.inference_kwargs.n_negative_samples=0",
"interface.api_endpoint='http://127.0.0.1:8080'",
],
"env": {
"CUDA_VISIBLE_DEVICES": "1"
}
},
{
"name": "Low Incontext Adept",
"type": "debugpy",
"request": "launch",
"console": "integratedTerminal",
"module": "align_system.cli.run_align_system",
"args": [
"loglevel=\"DEBUG\"",
"+experiment=metrics_refinement_evaluation/single_kdma_aligned_adept_low",
"adm=incontext/moral_deservingness",
"adm.inference_kwargs.n_negative_samples=0",
"interface.api_endpoint='http://127.0.0.1:8080'",
],
"env": {
"CUDA_VISIBLE_DEVICES": "1"
}
},
{
"name": "High Adept",
"type": "debugpy",
"request": "launch",
"console": "integratedTerminal",
"module": "align_system.cli.run_align_system",
"args": [
"loglevel=\"DEBUG\"",
"+experiment=metrics_refinement_evaluation/single_kdma_aligned_adept_high",
"adm.inference_kwargs.n_negative_samples=0",
"interface.api_endpoint='http://127.0.0.1:8080'",
],
"env": {
"CUDA_VISIBLE_DEVICES": "2"
}
},
{
"name": "Low Adept",
"type": "debugpy",
"request": "launch",
"console": "integratedTerminal",
"module": "align_system.cli.run_align_system",
"args": [
"loglevel=\"DEBUG\"",
"+experiment=metrics_refinement_evaluation/single_kdma_aligned_adept_low",
"adm.inference_kwargs.n_negative_samples=0",
"interface.api_endpoint='http://127.0.0.1:8080'",
],
"env": {
"CUDA_VISIBLE_DEVICES": "3"
}
},
{
"name": "High Baseline Adept",
"type": "debugpy",
"request": "launch",
"console": "integratedTerminal",
"module": "align_system.cli.run_align_system",
"args": [
"loglevel=\"DEBUG\"",
"+experiment=metrics_refinement_evaluation/single_kdma_baseline_adept_high",
"adm.inference_kwargs.n_negative_samples=0",
"interface.api_endpoint='http://127.0.0.1:8080'",
],
"env": {
"CUDA_VISIBLE_DEVICES": "3"
}
},
{
"name": "Low Baseline Adept",
"type": "debugpy",
"request": "launch",
"console": "integratedTerminal",
"module": "align_system.cli.run_align_system",
"args": [
"loglevel=\"DEBUG\"",
"+experiment=metrics_refinement_evaluation/single_kdma_baseline_adept_low",
"adm.inference_kwargs.n_negative_samples=0",
"interface.api_endpoint='http://127.0.0.1:8080'",
],
"env": {
"CUDA_VISIBLE_DEVICES": "3"
}
}
]
}
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,23 @@
This changelog follows the specifications detailed in: [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html), although we have not yet reached a `1.0.0` release.

## 0.4.0

### Changed

* (Major) Changed CLI configuration over to [Hydra](https://hydra.cc/); recommend reading the updated README

### Fixed

* Prevent ADMs from modifying original action objects

### Added

* Added new Oracle ADM (action based; attempts to "choose" best action based on KDMA values)
* Added new action based "Interface" for walking through Input Output JSON files
* Added simple accuracy metrics to the input-output file interface
* Added dedicated docs page for installing external (TA3, TA1s) services

## 0.3.3

### Changed
Expand Down
176 changes: 176 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,176 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS
13 changes: 13 additions & 0 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Copyright 2024 Kitware, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Loading