X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fdbsources%2FEBIAlfaFold.java;h=6b27488b24a67750f23a9e24735292502412817b;hb=6ca8a32d88328b8f2162512f41c657c87e131045;hp=531420754353d73cd23d9c5d5bab30c9a1f04c61;hpb=892e857760e779796e156b4fa36d97d8d31e73e1;p=jalview.git diff --git a/src/jalview/ws/dbsources/EBIAlfaFold.java b/src/jalview/ws/dbsources/EBIAlfaFold.java index 5314207..6b27488 100644 --- a/src/jalview/ws/dbsources/EBIAlfaFold.java +++ b/src/jalview/ws/dbsources/EBIAlfaFold.java @@ -27,9 +27,13 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; +import org.json.simple.JSONArray; +import org.json.simple.JSONObject; import org.json.simple.parser.ParseException; import com.stevesoft.pat.Regex; @@ -40,14 +44,19 @@ import jalview.datamodel.AlignmentAnnotation; import jalview.datamodel.AlignmentI; import jalview.datamodel.ContactMatrixI; import jalview.datamodel.DBRefEntry; +import jalview.datamodel.GroupSet; import jalview.datamodel.PDBEntry; import jalview.datamodel.SequenceFeature; import jalview.datamodel.SequenceI; +import jalview.gui.Desktop; import jalview.io.DataSourceType; import jalview.io.FileFormat; import jalview.io.FileFormatI; import jalview.io.FormatAdapter; import jalview.io.PDBFeatureSettings; +import jalview.structure.StructureImportSettings.TFType; +import jalview.structure.StructureMapping; +import jalview.structure.StructureSelectionManager; import jalview.util.MessageManager; import jalview.util.Platform; import jalview.ws.datamodel.alphafold.PAEContactMatrix; @@ -167,7 +176,7 @@ public class EBIAlfaFold extends EbiFileRetrievedProxy if (!isValidReference(id)) { - System.err.println( + jalview.bin.Console.errPrintln( "(AFClient) Ignoring invalid alphafold query: '" + id + "'"); stopQuery(); return null; @@ -191,6 +200,7 @@ public class EBIAlfaFold extends EbiFileRetrievedProxy { return null; } + // TODO Get the PAE file somewhere around here and remove from JmolParser pdbAlignment = importDownloadedStructureFromUrl(alphaFoldCif, tmpFile, id, chain, getDbSource(), getDbVersion()); @@ -213,8 +223,8 @@ public class EBIAlfaFold extends EbiFileRetrievedProxy } /** - * get an alphafold pAE for the given id, and add it to sequence 0 in - * pdbAlignment (assuming it came from structurefile parser). + * get an alphafold pAE for the given id and return the File object of the + * downloaded (temp) file * * @param id * @param pdbAlignment @@ -224,8 +234,8 @@ public class EBIAlfaFold extends EbiFileRetrievedProxy * @throws IOException * @throws Exception */ - public static void retrieve_AlphaFold_pAE(String id, - AlignmentI pdbAlignment, String retrievalUrl) throws IOException + public static File fetchAlphaFoldPAE(String id, String retrievalUrl) + throws IOException { // import PAE as contact matrix - assume this will work if there was a // model @@ -238,7 +248,16 @@ public class EBIAlfaFold extends EbiFileRetrievedProxy .replace(".cif", ".json"); } - File pae = null; + // check the cache + File pae = paeDownloadCache.get(paeURL); + if (pae != null && pae.exists() && (new Date().getTime() + - pae.lastModified()) < PAE_CACHE_STALE_TIME) + { + Console.debug( + "Using existing file in PAE cache for '" + paeURL + "'"); + return pae; + } + try { pae = File.createTempFile(id == null ? "af_pae" : id, "pae_json"); @@ -248,40 +267,129 @@ public class EBIAlfaFold extends EbiFileRetrievedProxy } Console.debug("Downloading pae from " + paeURL + " to " + pae.toString() + ""); - UrlDownloadClient.download(paeURL, pae); - addAlphaFoldPAE(pdbAlignment, pae); + try + { + UrlDownloadClient.download(paeURL, pae); + } catch (IOException e) + { + throw e; + } + // cache and it if successful + paeDownloadCache.put(paeURL, pae); + return pae; } - public static void addAlphaFoldPAE(AlignmentI pdbAlignment, File pae) + /** + * get an alphafold pAE for the given id, and add it to sequence 0 in + * pdbAlignment (assuming it came from structurefile parser). + * + * @param id + * @param pdbAlignment + * @param retrievalUrl + * - URL of .mmcif from EBI-AlphaFold - will be used to generate the + * pAE URL automatically + * @throws IOException + * @throws Exception + */ + public static void retrieve_AlphaFold_pAE(String id, + AlignmentI pdbAlignment, String retrievalUrl) throws IOException { - FileInputStream pae_input = null; + File pae = fetchAlphaFoldPAE(id, retrievalUrl); + addAlphaFoldPAE(pdbAlignment, pae, 0, null, false, false, null); + } + + public static void addAlphaFoldPAE(AlignmentI pdbAlignment, File pae, + int index, String id, boolean isStruct, boolean isStructId, + String label) + { + FileInputStream paeInput = null; try { - pae_input = new FileInputStream(pae); + paeInput = new FileInputStream(pae); } catch (FileNotFoundException e) { Console.error( "Could not find pAE file '" + pae.getAbsolutePath() + "'", e); + return; } - try + if (isStruct) { - if (!importPaeJSONAsContactMatrix(pdbAlignment, pae_input)) + // ###### WRITE A TEST for this bit of the logic addAlphaFoldPAE with + // different params. + StructureSelectionManager ssm = StructureSelectionManager + .getStructureSelectionManager(Desktop.instance); + if (ssm != null) { - Console.warn("Could not import contact matrix from '" - + pae.getAbsolutePath() + "'"); + String structFilename = isStructId ? ssm.findFileForPDBId(id) : id; + addPAEToStructure(ssm, structFilename, pae, label); } - } catch (IOException e1) + + } + else { - Console.error("Error when importing pAE file '" - + pae.getAbsolutePath() + "'", e1); - } catch (ParseException e2) + // attach to sequence?! + try + { + if (!importPaeJSONAsContactMatrixToSequence(pdbAlignment, paeInput, + index, id, label)) + { + Console.warn("Could not import contact matrix from '" + + pae.getAbsolutePath() + "' to sequence."); + } + } catch (IOException e1) + { + Console.error("Error when importing pAE file '" + + pae.getAbsolutePath() + "'", e1); + } catch (ParseException e2) + { + Console.error("Error when parsing pAE file '" + + pae.getAbsolutePath() + "'", e2); + } + } + + } + + public static void addPAEToStructure(StructureSelectionManager ssm, + String structFilename, File pae, String label) + { + FileInputStream paeInput = null; + try + { + paeInput = new FileInputStream(pae); + } catch (FileNotFoundException e) { Console.error( - "Error when parsing pAE file '" + pae.getAbsolutePath() + "'", - e2); + "Could not find pAE file '" + pae.getAbsolutePath() + "'", e); + return; } + if (ssm == null) + { + ssm = StructureSelectionManager + .getStructureSelectionManager(Desktop.instance); + } + if (ssm != null) + { + StructureMapping[] smArray = ssm.getMapping(structFilename); + try + { + if (!importPaeJSONAsContactMatrixToStructure(smArray, paeInput, + label)) + { + Console.warn("Could not import contact matrix from '" + + pae.getAbsolutePath() + "' to structure."); + } + } catch (IOException e1) + { + Console.error("Error when importing pAE file '" + + pae.getAbsolutePath() + "'", e1); + } catch (ParseException e2) + { + Console.error("Error when parsing pAE file '" + + pae.getAbsolutePath() + "'", e2); + } + } } /** @@ -295,23 +403,112 @@ public class EBIAlfaFold extends EbiFileRetrievedProxy * @throws IOException * @throws Exception */ - public static boolean importPaeJSONAsContactMatrix( - AlignmentI pdbAlignment, InputStream pae_input) + public static boolean importPaeJSONAsContactMatrixToSequence( + AlignmentI pdbAlignment, InputStream pae_input, int index, + String seqId, String label) throws IOException, ParseException + { + SequenceI sequence = null; + if (seqId == null) + { + int seqToGet = index > 0 ? index : 0; + sequence = pdbAlignment.getSequenceAt(seqToGet); + } + if (sequence == null) + { + SequenceI[] sequences = pdbAlignment.findSequenceMatch(seqId); + if (sequences == null || sequences.length < 1) + { + Console.warn("Could not find sequence with id '" + seqId + + "' to attach pAE matrix to. Ignoring matrix."); + return false; + } + else + { + sequence = sequences[0]; // just use the first sequence with this seqId + } + } + if (sequence == null) + { + return false; + } + return importPaeJSONAsContactMatrixToSequence(pdbAlignment, pae_input, + sequence, label); + } + + public static boolean importPaeJSONAsContactMatrixToSequence( + AlignmentI pdbAlignment, InputStream pae_input, + SequenceI sequence, String label) + throws IOException, ParseException + { + JSONObject paeDict = parseJSONtoPAEContactMatrix(pae_input); + if (paeDict == null) + { + Console.debug("JSON file did not parse properly."); + return false; + } + ContactMatrixI matrix = new PAEContactMatrix(sequence, + (Map) paeDict); + + AlignmentAnnotation cmannot = sequence.addContactList(matrix); + if (label != null) + cmannot.label = label; + pdbAlignment.addAnnotation(cmannot); + + return true; + } + + public static JSONObject parseJSONtoPAEContactMatrix( + InputStream pae_input) throws IOException, ParseException + { + Object paeJson = Platform.parseJSON(pae_input); + JSONObject paeDict = null; + if (paeJson instanceof JSONObject) + { + paeDict = (JSONObject) paeJson; + } + else if (paeJson instanceof JSONArray) + { + JSONArray jsonArray = (JSONArray) paeJson; + if (jsonArray.size() > 0) + paeDict = (JSONObject) jsonArray.get(0); + } + + return paeDict; + } + + // ###### TEST THIS + public static boolean importPaeJSONAsContactMatrixToStructure( + StructureMapping[] smArray, InputStream paeInput, String label) throws IOException, ParseException { + boolean someDone = false; + for (StructureMapping sm : smArray) + { + boolean thisDone = importPaeJSONAsContactMatrixToStructure(sm, + paeInput, label); + someDone |= thisDone; + } + return someDone; + } - List pae_obj = (List) Platform.parseJSON(pae_input); + public static boolean importPaeJSONAsContactMatrixToStructure( + StructureMapping sm, InputStream paeInput, String label) + throws IOException, ParseException + { + JSONObject pae_obj = parseJSONtoPAEContactMatrix(paeInput); if (pae_obj == null) { + Console.debug("JSON file did not parse properly."); return false; } - ContactMatrixI matrix = new PAEContactMatrix( - pdbAlignment.getSequenceAt(0), - (Map) pae_obj.get(0)); - AlignmentAnnotation cmannot = pdbAlignment.getSequenceAt(0) - .addContactList(matrix); - pdbAlignment.addAnnotation(cmannot); + SequenceI seq = sm.getSequence(); + ContactMatrixI matrix = new PAEContactMatrix(seq, + (Map) pae_obj); + AlignmentAnnotation cmannot = sm.getSequence().addContactList(matrix); + /* this already happens in Sequence.addContactList() + seq.addAlignmentAnnotation(cmannot); + */ return true; } @@ -335,8 +532,10 @@ public class EBIAlfaFold extends EbiFileRetrievedProxy String file = tmpFile.getAbsolutePath(); // todo get rid of Type and use FileFormatI instead? FileFormatI fileFormat = FileFormat.MMCif; - AlignmentI pdbAlignment = new FormatAdapter().readFile(tmpFile, - DataSourceType.FILE, fileFormat); + TFType tempfacType = TFType.PLDDT; + AlignmentI pdbAlignment = new FormatAdapter().readFile(tmpFile, file, + DataSourceType.FILE, fileFormat, tempfacType); + if (pdbAlignment != null) { List toremove = new ArrayList(); @@ -349,7 +548,6 @@ public class EBIAlfaFold extends EbiFileRetrievedProxy if (pid.getFile() == file) { chid = pid.getChainCode(); - } } if (chain == null || (chid != null && (chid.equals(chain) @@ -472,4 +670,9 @@ public class EBIAlfaFold extends EbiFileRetrievedProxy return new PDBFeatureSettings(); } + // days * 86400000 + private static final long PAE_CACHE_STALE_TIME = 1 * 86400000; + + private static Map paeDownloadCache = new HashMap<>(); + }