Skip to content

Commit

Permalink
Merge pull request #86 from zucisystems-dev/model_id_changes
Browse files Browse the repository at this point in the history 
Model id changes
  • Loading branch information
@Sanjeeya-Velayutham-ZS0029
Sanjeeya-Velayutham-ZS0029 authored Mar 4, 2024
2 parents 317af68 + fc3ecb1 commit e177825
Show file tree
Hide file tree
Showing 17 changed files with 229 additions and 127 deletions.
4 changes: 2 additions & 2 deletions src/main/java/in/handyman/raven/lib/NerAdapterAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
actionName = "NerAdapter"
)
public class NerAdapterAction implements IActionExecution {
public static final String COLUMN_LIST = "origin_id, paper_no, group_id, process_id, sor_id, sor_item_id, sor_item_name, question, answer,weight, created_user_id, tenant_id, created_on, word_score, char_score, validator_score_allowed, validator_score_negative, confidence_score, validation_name, b_box,status,stage,message,vqa_score,question_id,synonym_id,model_name,model_version";
public static final String COLUMN_LIST = "origin_id, paper_no, group_id, process_id, sor_id, sor_item_id, sor_item_name, question,question_id,synonym_id, answer,vqa_score, weight, created_user_id, tenant_id, created_on, word_score, char_score, validator_score_allowed, validator_score_negative, confidence_score, validation_name, b_box,status,stage,message,root_pipeline_id, model_name,model_version, model_registry";
private final ActionExecutionAudit action;
private final Logger log;
private final NerAdapter nerAdapter;
Expand All @@ -61,7 +61,7 @@ public void execute() throws Exception {
// build insert prepare statement with output table columns
final String insertQuery = "INSERT INTO " + nerAdapter.getResultTable() +
"(" + COLUMN_LIST + ")" +
" VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? ,?,?, ?, ?, ?, ?, ?,?,?,? ,? ,?,?,?,?);";
" VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?,?, ?, ?, ?, ?, ?,?,?,?,?,?,?,?,?,?,?);";
log.info(aMarker, "ner adapter Insert query {}", insertQuery);

//3. initiate copro processor and copro urls
Expand Down
52 changes: 28 additions & 24 deletions src/main/java/in/handyman/raven/lib/ScalarAdapterAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ private void doCompute(final Jdbi jdbi, List<ValidatorConfigurationDetail> listO
result.setCharScore(charScore);
result.setValidatorScore(validatorScore);
result.setValidatorNegativeScore(validatorNegativeScore);
result.setRootPipeLineId(action.getRootPipelineId());
result.setRootPipelineId(action.getRootPipelineId());
result.setConfidenceScore(valConfidenceScore);
result.setProcessId(String.valueOf(action.getProcessId()));
result.setStatus("COMPLETED");
Expand Down Expand Up @@ -268,8 +268,8 @@ void consumerBatch(final Jdbi jdbi, List<ValidatorConfigurationDetail> resultQue
resultQueue.forEach(insert -> {
jdbi.useTransaction(handle -> {
try {
String COLUMN_LIST = "root_pipeline_id, origin_id, paper_no, group_id, process_id, sor_id, sor_item_id, sor_item_name,question, answer, weight, created_user_id, tenant_id, created_on, word_score, char_score, validator_score_allowed, validator_score_negative, confidence_score,validation_name,b_box,status,stage,message,vqa_score,question_id,synonym_id";
String COLUMN_BINDED_LIST = ":rootPipeLineId, :originId, :paperNo, :groupId, :processId , :sorId, :sorItemId, :sorKey, :question ,:inputValue, :weight, :createdUserId, :tenantId, NOW(), :wordScore , :charScore , :validatorScore, :validatorNegativeScore, :confidenceScore,:allowedAdapter,:bbox,:status,:stage,:message,:vqaScore,:questionId,:synonymId";
String COLUMN_LIST = "origin_id, paper_no, group_id, process_id, sor_id, sor_item_id, sor_item_name,question,question_id, synonym_id, answer,vqa_score, weight, created_user_id, tenant_id, created_on, word_score, char_score, validator_score_allowed, validator_score_negative, confidence_score,validation_name,b_box,status,stage,message,root_pipeline_id,model_name,model_version, model_registry";
String COLUMN_BINDED_LIST = ":originId, :paperNo, :groupId, :processId , :sorId, :sorItemId, :sorKey, :question ,:questionId, :synonymId, :inputValue,:vqaScore, :weight, :createdUserId, :tenantId, NOW(), :wordScore , :charScore , :validatorScore, :validatorNegativeScore, :confidenceScore,:allowedAdapter,:bbox,:status,:stage,:message,:rootPipelineId,:modelName,:modelVersion, :modelRegistry";
Update update = handle.createUpdate(" INSERT INTO sor_transaction.adapter_result_" + scalarAdapter.getProcessID() +
" ( " + COLUMN_LIST + ") " +
" VALUES( " + COLUMN_BINDED_LIST + ");" +
Expand Down Expand Up @@ -384,42 +384,46 @@ public static class SanitarySummary {
@Builder
@JsonIgnoreProperties(ignoreUnknown = true)
public static class ValidatorConfigurationDetail {
private int sorId;
private String originId;
private Long rootPipeLineId;
private int paperNo;
private Integer groupId;
private String ProcessId;
private int sorId;
private int sorItemId;
private String sorKey;
private String question;
private Integer questionId;
private Integer synonymId;
private String inputValue;
private String allowedAdapter;
private String restrictedAdapter;
private int wordLimit;
private int wordThreshold;
private int charLimit;
private int charThreshold;
private int validatorThreshold;
private String allowedCharacters;
private String comparableCharacters;
private int restrictedAdapterFlag;
private int paperNo;
private Integer groupId;
private String bbox;
private int sorItemId;
private float vqaScore;
private int weight;
private String createdUserId;
private Long tenantId;
private double wordScore;
private double charScore;
private double validatorScore;
private double validatorNegativeScore;
private double confidenceScore;
private String sorItemName;
private float vqaScore;
private int weight;
private String allowedAdapter;
private String restrictedAdapter;
private String bbox;
private String status;
private String stage;
private String message;
private Integer synonymId;
private Integer questionId;
private Long rootPipelineId;
private String modelName;
private String modelVersion;
private String modelRegistry;

private int wordLimit;
private int wordThreshold;
private int charLimit;
private int charThreshold;
private int validatorThreshold;
private String allowedCharacters;
private String comparableCharacters;
private int restrictedAdapterFlag;
private String sorItemName;
}

}
Loading

0 comments on commit e177825

Please sign in to comment.