fix

packages/frontend/.env.local

@@ -1,6 +1,6 @@
 VITE_NETWORK=134
 VITE_WEB3_GATEWAY=https://bellecour.iex.ec
-VITE_CONTRACT_TASKRESULT_TX=0xa2572210bfcd11d2bfecb3f4a08fff0303a139a9b7077e0b33421f8cb2cc985a
-VITE_CONTRACT_TASKRESULT=0x77B78c87FC2EeBE8D76C4D37d5091064B4a923F5
+VITE_CONTRACT_TASKRESULT_TX=0xa530f91d9a5a3137459652f99841ba86271b464db384a44951930fc132fd6d9a
+VITE_CONTRACT_TASKRESULT=0x1e35359854115f259d678142429F6659c49efBa1
 VITE_CONTRACT_LLMQUESTION_TX=0xed0ccc8dbd57f5ac46c0489d76ebf919e8eb52213a878b64a1c251033aa2e610
 VITE_CONTRACT_LLMQUESTION=0x3790add8f936F5066515fA60B63F1069bB58ED10

packages/frontend/src/App.vue

@@ -10,7 +10,6 @@ import { RouterView } from 'vue-router';
     <nav>
       <RouterLink to="/">Home</RouterLink>
       <RouterLink to="/questions">Questions</RouterLink>
-      <RouterLink to="/upload">Upload</RouterLink>
     </nav>
 
     <RouterView />

packages/frontend/src/components/HelloWorld.vue

@@ -1,24 +1,43 @@
 <script setup lang="ts">
 import { ref, toValue } from 'vue'
 
-import { ethersBrowserProvider } from '../wallet';
 import { useIExec } from '../iexec';
 import { ProtectedData } from '@iexec/dataprotector';
+import { getTaskInfo } from '../taskresult';
+import { getQuestion } from '../qlist';
 
 const { dataProtectorCore, dataProtectorWallet } = useIExec();
 
 const results = ref<ProtectedData[]>([]);
 const isLoading = ref(false);
+const extraData = ref<any[]>([]);
 
 async function refreshData() {
   isLoading.value = true;
   try {
-    const browserOwner = (await toValue(ethersBrowserProvider)!.getSigner()).address;
+    const dpw = toValue(dataProtectorWallet)!
+    const browserOwner = dpw.address;
     //const dpw = toValue(dataProtectorWallet)!
     const dpc = toValue(dataProtectorCore)!;
+    const extra = [];
     const blah = results.value = await dpc.getProtectedData({
-      owner: browserOwner
+      owner: browserOwner,
+      pageSize: 100,
+      requiredSchema: {
+        bulgariaIsCool: "bool"
+      }
     });
+    for( const b of blah ) {
+      const i = await getTaskInfo(dpw, b.address)
+      const qid = i[2];
+      const taskid = i[0];
+      //const result = i[1];
+      const q = await getQuestion(dpw, qid);
+      const qtitle = q[1];
+      console.log(i, q);
+      extra.push({qid,taskid,qtitle});
+    }
+    extraData.value = extra as any;
     console.log(blah);
   } finally {
     isLoading.value = false;
@@ -36,11 +55,10 @@ refreshData();
   owner: {{  dataProtectorWallet?.address  }}
 
   <div class="card">
-    <div class="item" v-for="item in results">
+    <div class="item" v-for="(item, index) in results">
+      <h3>{{ toValue(extraData)[index].qtitle }}</h3>
       Address: {{ item.address }}<br />
-      Schema: {{ item.schema }}<br />
       Timestamp: {{ item.creationTimestamp }}<br />
-      Owner: {{ item.owner }}<br />
     </div>
 
     <button @click.prevent="refreshData">Refresh</button>
@@ -50,6 +68,7 @@ refreshData();
 <style scoped>
 div.item {
   border: 1px solid #333;
-  margin-bottom: 5px;
+  margin-bottom: 20px;
+  padding-bottom: 20px;;
 }
 </style>

packages/frontend/src/components/ProtectShit.vue

@@ -53,7 +53,7 @@ async function loadQuestion() {
         throw new Error('No qid!');
     }
     const x = questionnaire.value = await getQuestion(dpw, qid);
-    for( const _ in x.questions ) {
+    for( const _ in x[2] ) {
         qv.push('');
     }
     console.log('Question loaded', x);
@@ -65,7 +65,7 @@ const isFormError = ref(false);
 const formErrorFields = ref<string[]>([]);
 
 /// Checks if the questions have been answered
-const areAnswersValid = computed(()=> {
+function areAnswersValid () {
     let isValid = true;
     formErrorFields.value = [];
     const errors = [];
@@ -74,7 +74,7 @@ const areAnswersValid = computed(()=> {
         return {isValid:false,errors:[]};
     }
     for( const i in x[2] ) {
-        const q = x.questions[i];
+        const q = x[2][i];
         const v = qv[i as unknown as number];
         const qt = q[1];
         if( qt === 'prompt' || qt === 'info' ) {
@@ -86,7 +86,7 @@ const areAnswersValid = computed(()=> {
         }
     }
     return {isValid, errors};
-});
+};
 
 const isButtonDisabled = computed(() => {
     const hasDataProtectorCore = toValue(dataProtectorCore) !== undefined;
@@ -96,7 +96,7 @@ const isButtonDisabled = computed(() => {
 });
 
 function validateQuestions() {
-    const {isValid,errors} = toValue(areAnswersValid);
+    const {isValid,errors} = areAnswersValid();
     formErrorFields.value = errors;
     isFormError.value = isValid === false;
     console.log('isVaid', isValid);
@@ -155,9 +155,12 @@ async function doProtectData () {
         isSuccess.value = false;
         //const browserWalletAddress = (await ebp.getSigner()).address;
         try {
+            const fakeResultPromise = evaluatePrompt(llm_input)
+
             const result = dpcResult.value = await dpc.protectData({
                 data: {
-                    email: llm_input
+                    email: llm_input,
+                    bulgariaIsCool: true
                 },
                 onStatusUpdate: ({title, isDone}) => {
                     console.log('Data Protector', title, isDone);
@@ -198,7 +201,10 @@ async function doProtectData () {
             });
             console.log(protectedResult);
 
-            const receipt = await associateTaskResults(dpw, result.address, protectedResult.taskId, '');
+            const fakeResult = await fakeResultPromise;
+            console.log('fakeResult s', fakeResult);
+
+            const receipt = await associateTaskResults(dpw, result.address, protectedResult.taskId, fakeResult, qid);
             /*
             const contract = getTaskRunnerContract(dpw); // new Contract(taskResultContractAddr, taskResultABI, dpw);
             const tx = await contract.associate(result.address, protectedResult.taskId);
@@ -213,9 +219,6 @@ async function doProtectData () {
                 console.log('X is', x);
             }
 
-            const fakeResult = await evaluatePrompt(llm_input)
-            console.log('fakeResult s', fakeResult);
-
             // Finally transfer it to the browser owner
             /*
             dpcStatusText.value = 'Tansferring Ownership';
@@ -255,8 +258,9 @@ async function doProtectData () {
             </ul>
         </div>
 
+        <br />
         <button type="button" :disabled="toValue(isButtonDisabled)" @click="doProtectData()">
-            Do Everything
+            Submit Answers
         </button>
         <br />
 

packages/frontend/src/components/QuestionField.vue

@@ -35,7 +35,7 @@ const title = q[0];
 const qtype = q[1];
 const options = q[2] !== undefined ? (q[2][0] === '[' ? JSON.parse(q[2] as string) : q[2]) : '';
 
-console.log('title', title, 'qtype', qtype, 'options', typeof options, options);
+//console.log('title', title, 'qtype', qtype, 'options', typeof options, options);
 
 const range:number[] = [];
 if( qtype == 'range' && options ) {

packages/frontend/src/llm.ts

@@ -25,7 +25,7 @@ export async function evaluatePrompt(prompt :string) {
     }
 
     let result = await wllama.createCompletion(prompt, {
-        nPredict: 300
+        nPredict: 10
     });
 
     return result;

packages/frontend/src/taskresult.ts

@@ -3,6 +3,11 @@ import { Contract, ContractRunner, ContractTransactionResponse } from "ethers";
 const taskResultContractAddr = import.meta.env.VITE_CONTRACT_TASKRESULT;
 
 const taskResultABI = [
+  {
+    "inputs": [],
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
   {
     "inputs": [
       {
@@ -19,6 +24,11 @@ const taskResultABI = [
         "internalType": "string",
         "name": "data",
         "type": "string"
+      },
+      {
+        "internalType": "uint256",
+        "name": "questionId",
+        "type": "uint256"
       }
     ],
     "name": "associate",
@@ -45,6 +55,11 @@ const taskResultABI = [
         "internalType": "string",
         "name": "data",
         "type": "string"
+      },
+      {
+        "internalType": "uint256",
+        "name": "questionId",
+        "type": "uint256"
       }
     ],
     "stateMutability": "view",
@@ -69,14 +84,19 @@ export function getTaskRunnerContract (runner:ContractRunner) {
     return new Contract(taskResultContractAddr, taskResultABI, runner);
 }
 
+export async function getTaskInfo(runner:ContractRunner, datasetAddress:string) {
+  const contract = getTaskRunnerContract(runner);
+  return contract.datasetTasks(datasetAddress);
+}
 export async function associateTaskResults (
   runner:ContractRunner,
   owner:string,
   taskId:string,
-  result:string
+  result:string,
+  questionId:number
 )
 {
   const contract = getTaskRunnerContract(runner);
-  const tx = await contract.associate(owner, taskId, result) as ContractTransactionResponse;
+  const tx = await contract.associate(owner, taskId, result, questionId) as ContractTransactionResponse;
   return await tx.wait();
 }

packages/nft/contracts/TaskResult.sol

@@ -18,6 +18,7 @@ contract TaskResult {
     struct Response {
         bytes32 taskId;
         string data;
+        uint questionId;
     }
 
     mapping(address datasetAddress => Response response) public datasetTasks;
@@ -28,11 +29,12 @@ contract TaskResult {
         registry = IERC721(0x799DAa22654128d0C64d5b79eac9283008158730);
     }
 
-    function associate(address dataset, bytes32 taskId, string calldata data) external {
+    function associate(address dataset, bytes32 taskId, string calldata data, uint questionId) external {
         require( registry.ownerOf(uint256(uint160(dataset))) == msg.sender, "not owner" );
         datasetTasks[dataset] = Response({
             taskId: taskId,
-            data: data
+            data: data,
+            questionId: questionId
         });
     }
 }