Minor GUI refactor - Drag+drop issues introduced
This commit is contained in:
parent
1c1620d91a
commit
4bf2513f31
3
.gitattributes
vendored
Normal file
3
.gitattributes
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
*.bin filter=lfs diff=lfs merge=lfs -text
|
||||
*.db filter=lfs diff=lfs merge=lfs -text
|
||||
*.sqlite3 filter=lfs diff=lfs merge=lfs -text
|
||||
127
Documentation/gui_file_table_refactor_plan.md
Normal file
127
Documentation/gui_file_table_refactor_plan.md
Normal file
@ -0,0 +1,127 @@
|
||||
# Code Review & Refactoring Plan: GUI File Table
|
||||
|
||||
**Objective:** To identify the root causes of file list discrepancies and persistent empty asset rows in the GUI file table, and to propose refactoring solutions for improved robustness and maintainability.
|
||||
|
||||
**Phase 1: In-Depth Code Review**
|
||||
|
||||
This phase will focus on understanding the current implementation and data flow within the relevant GUI modules.
|
||||
|
||||
1. **Identify Key Modules & Classes:**
|
||||
* **`gui/unified_view_model.py` ([`UnifiedViewModel`](gui/unified_view_model.py:1)):** This is the primary focus. We need to analyze:
|
||||
* How it loads and represents the hierarchical data (`SourceRule` -> `AssetRule` -> `FileRule`).
|
||||
* Methods responsible for updating the model with new data (e.g., from predictions or user edits).
|
||||
* Logic for adding, removing, and modifying rows, especially `AssetRule` and `FileRule` items.
|
||||
* How it handles data consistency when underlying data changes (e.g., after LLM processing or renaming operations).
|
||||
* Signal/slot connections related to data changes.
|
||||
* **`gui/asset_restructure_handler.py` ([`AssetRestructureHandler`](gui/asset_restructure_handler.py:1)):**
|
||||
* How it listens to changes in `AssetRule` names or `FileRule` target asset overrides.
|
||||
* The logic for moving `FileRule` items between `AssetRule` items.
|
||||
* The conditions under which it creates new `AssetRule` items or removes empty ones. This is critical for the "persistent empty asset rows" issue.
|
||||
* **`gui/llm_prediction_handler.py` ([`LLMPredictionHandler`](gui/llm_prediction_handler.py:1)):**
|
||||
* How it parses the LLM response.
|
||||
* How it translates the LLM's (potentially hallucinated) file list into the `SourceRule` structure.
|
||||
* How this new `SourceRule` data is passed to and integrated by the `UnifiedViewModel`. This is key for the "file list discrepancies" issue.
|
||||
* **`gui/prediction_handler.py` ([`RuleBasedPredictionHandler`](gui/prediction_handler.py:1)):**
|
||||
* Similar to the LLM handler, how it generates `SourceRule` data from presets.
|
||||
* How its output is integrated into the `UnifiedViewModel`, especially when "reinterpreting with a systematic approach" restores correct files.
|
||||
* **`gui/main_window.py` ([`MainWindow`](gui/main_window.py:1)) & `gui/main_panel_widget.py` ([`MainPanelWidget`](gui/main_panel_widget.py:1)):**
|
||||
* How these components instantiate and connect the `UnifiedViewModel`, `AssetRestructureHandler`, and prediction handlers.
|
||||
* Event handling related to loading data, triggering predictions, and user interactions that modify the table data.
|
||||
* **`rule_structure.py`:**
|
||||
* Review the definitions of `SourceRule`, `AssetRule`, and `FileRule` to ensure a clear understanding of the data being managed.
|
||||
|
||||
2. **Trace Data Flow & State Management:**
|
||||
* **Initial Load:** How is the initial list of files/assets loaded and represented in the `UnifiedViewModel`?
|
||||
* **LLM Processing:**
|
||||
* Trace the data flow from the LLM response -> `LLMPredictionHandler` -> `UnifiedViewModel`.
|
||||
* How does the `UnifiedViewModel` reconcile the LLM's version of the file list with any existing state? Is there a clear "source of truth" for the file list before and after LLM processing?
|
||||
* **Preset-Based Processing:**
|
||||
* Trace data flow from preset selection -> `RuleBasedPredictionHandler` -> `UnifiedViewModel`.
|
||||
* How does this "systematic approach" correct discrepancies? Does it fully replace the model's data or merge it?
|
||||
* **Renaming/Restructuring:**
|
||||
* Trace the events and actions from a user renaming an asset -> `AssetRestructureHandler` -> `UnifiedViewModel`.
|
||||
* How are `AssetRule` items checked for emptiness and subsequently removed (or not removed)?
|
||||
|
||||
3. **Analyze Event Handling and Signal/Slot Connections:**
|
||||
* Map out the key signals and slots between the `UnifiedViewModel`, `AssetRestructureHandler`, prediction handlers, and the main UI components.
|
||||
* Ensure that signals are emitted and slots are connected correctly to trigger necessary updates and prevent race conditions or missed updates.
|
||||
|
||||
**Phase 2: Identify Issues & Propose Refactoring Strategies**
|
||||
|
||||
Based on the review, we will pinpoint specific areas contributing to the reported problems and suggest improvements.
|
||||
|
||||
1. **For File List Discrepancies (especially post-LLM):**
|
||||
* **Potential Issue:** The `UnifiedViewModel` might be directly replacing its internal data with the LLM's output without proper validation or merging against the original input file list.
|
||||
* **Proposed Strategy:**
|
||||
* Establish a clear "source of truth" for the actual input files that remains independent of the LLM's interpretation.
|
||||
* When the LLM provides its categorized list, the `LLMPredictionHandler` or `UnifiedViewModel` should *map* the LLM's findings onto the *existing* source files rather than creating a new list from scratch based on LLM hallucinations.
|
||||
* If the LLM identifies files not in the original input, these should be flagged or handled as discrepancies, not added as if they were real.
|
||||
* If the LLM *misses* files from the original input, these should remain visible, perhaps marked as "uncategorized by LLM."
|
||||
|
||||
2. **For Persistent Empty Asset Rows:**
|
||||
* **Potential Issue:** The `AssetRestructureHandler`'s logic for detecting and removing empty `AssetRule` items might be flawed or not consistently triggered. It might not correctly count child `FileRule` items after a move, or the signal to check for emptiness might not always fire.
|
||||
* **Proposed Strategy:**
|
||||
* Review and strengthen the logic within `AssetRestructureHandler` that checks if an `AssetRule` is empty after its `FileRule` children are moved or its name changes.
|
||||
* Ensure that this check is reliably performed *after* all relevant model updates have completed.
|
||||
* Consider adding explicit methods to `UnifiedViewModel` or `AssetRule` to query if an asset group is truly empty (has no associated `FileRule` items).
|
||||
* Ensure that the `UnifiedViewModel` correctly emits signals that the `AssetRestructureHandler` can use to trigger cleanup of empty asset rows.
|
||||
|
||||
3. **General Robustness & Maintainability:**
|
||||
* **State Management:** Clarify state management within `UnifiedViewModel`. Ensure data consistency and minimize side effects.
|
||||
* **Modularity:** Ensure clear separation of concerns between the `UnifiedViewModel` (data representation), prediction handlers (data generation), and `AssetRestructureHandler` (data manipulation).
|
||||
* **Logging & Error Handling:** Improve logging in these critical sections to make troubleshooting easier. Add robust error handling for unexpected data states.
|
||||
* **Unit Tests:** Identify areas where unit tests could be added or improved to cover the scenarios causing these bugs, especially around model updates and restructuring.
|
||||
|
||||
**Phase 3: Documentation & Handoff**
|
||||
|
||||
1. Document the findings of the code review.
|
||||
2. Detail the agreed-upon refactoring plan.
|
||||
3. Prepare for handoff to a developer (e.g., by switching to "Code" mode).
|
||||
|
||||
**Visual Plan (Mermaid Diagram):**
|
||||
|
||||
```mermaid
|
||||
graph TD
|
||||
subgraph GUI Interaction
|
||||
UserAction[User Action (Load Files, Rename Asset, Trigger LLM)]
|
||||
end
|
||||
|
||||
subgraph Prediction Layer
|
||||
LLM_Handler([`gui.llm_prediction_handler.LLMPredictionHandler`])
|
||||
Preset_Handler([`gui.prediction_handler.RuleBasedPredictionHandler`])
|
||||
end
|
||||
|
||||
subgraph Core GUI Logic
|
||||
MainWindow([`gui.main_window.MainWindow`])
|
||||
MainPanel([`gui.main_panel_widget.MainPanelWidget`])
|
||||
ViewModel([`gui.unified_view_model.UnifiedViewModel`])
|
||||
RestructureHandler([`gui.asset_restructure_handler.AssetRestructureHandler`])
|
||||
end
|
||||
|
||||
subgraph Data Structures
|
||||
RuleStruct([`rule_structure.py` <br> SourceRule, AssetRule, FileRule])
|
||||
end
|
||||
|
||||
UserAction --> MainWindow
|
||||
MainWindow --> MainPanel
|
||||
MainPanel -- Triggers Predictions --> LLM_Handler
|
||||
MainPanel -- Triggers Predictions --> Preset_Handler
|
||||
MainPanel -- Displays Data From --> ViewModel
|
||||
|
||||
LLM_Handler -- Provides SourceRule Data --> ViewModel
|
||||
Preset_Handler -- Provides SourceRule Data --> ViewModel
|
||||
|
||||
ViewModel -- Manages --> RuleStruct
|
||||
ViewModel -- Signals Changes --> RestructureHandler
|
||||
ViewModel -- Signals Changes --> MainPanel
|
||||
|
||||
|
||||
RestructureHandler -- Modifies --> ViewModel
|
||||
|
||||
%% Issues
|
||||
style LLM_Handler fill:#f9d,stroke:#333,stroke-width:2px %% Highlight LLM Handler for file list issue
|
||||
style ViewModel fill:#f9d,stroke:#333,stroke-width:2px %% Highlight ViewModel for both issues
|
||||
style RestructureHandler fill:#f9d,stroke:#333,stroke-width:2px %% Highlight Restructure Handler for empty row issue
|
||||
|
||||
note right of LLM_Handler: Potential source of file list discrepancies
|
||||
note right of RestructureHandler: Potential source of persistent empty asset rows
|
||||
280
TestFiles/TestConfig/Presets/Dinesen.json
Normal file
280
TestFiles/TestConfig/Presets/Dinesen.json
Normal file
@ -0,0 +1,280 @@
|
||||
{
|
||||
"preset_name": "Dinesen",
|
||||
"supplier_name": "Dinesen",
|
||||
"notes": "Preset for standard Poliigon downloads. Prioritizes _xxx16 files. Moves previews etc. to Extra/. Assumes Metal/Rough workflow.",
|
||||
"source_naming": {
|
||||
"separator": "_",
|
||||
"part_indices": {
|
||||
"base_name": 0,
|
||||
"map_type": 1
|
||||
},
|
||||
"glossiness_keywords": [
|
||||
"GLOSS"
|
||||
]
|
||||
},
|
||||
"move_to_extra_patterns": [
|
||||
"*_Preview*",
|
||||
"*_Sphere*",
|
||||
"*_Cube*",
|
||||
"*_Flat*",
|
||||
"*.txt",
|
||||
"*.pdf",
|
||||
"*.url",
|
||||
"*.htm*",
|
||||
"*_Fabric.*",
|
||||
"*_DISP_*METALNESS*"
|
||||
],
|
||||
"map_type_mapping": [
|
||||
{
|
||||
"target_type": "MAP_COL",
|
||||
"keywords": [
|
||||
"COLOR*",
|
||||
"COL",
|
||||
"COL-*",
|
||||
"DIFFUSE",
|
||||
"DIF",
|
||||
"ALBEDO"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_NRM",
|
||||
"keywords": [
|
||||
"NORMAL*",
|
||||
"NORM*",
|
||||
"NRM*",
|
||||
"N"
|
||||
],
|
||||
"priority_keywords": [
|
||||
"*_NRM16*",
|
||||
"*_NM16*",
|
||||
"*Normal16*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_ROUGH",
|
||||
"keywords": [
|
||||
"ROUGHNESS",
|
||||
"ROUGH"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_GLOSS",
|
||||
"keywords": [
|
||||
"GLOSS"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_AO",
|
||||
"keywords": [
|
||||
"AMBIENTOCCLUSION",
|
||||
"AO"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_DISP",
|
||||
"keywords": [
|
||||
"DISPLACEMENT",
|
||||
"DISP",
|
||||
"HEIGHT",
|
||||
"BUMP"
|
||||
],
|
||||
"priority_keywords": [
|
||||
"*_DISP16*",
|
||||
"*_DSP16*",
|
||||
"*DSP16*",
|
||||
"*DISP16*",
|
||||
"*Displacement16*",
|
||||
"*Height16*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_REFL",
|
||||
"keywords": [
|
||||
"REFLECTION",
|
||||
"REFL",
|
||||
"SPECULAR",
|
||||
"SPEC"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_SSS",
|
||||
"keywords": [
|
||||
"SSS",
|
||||
"SUBSURFACE*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_FUZZ",
|
||||
"keywords": [
|
||||
"FUZZ"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_IDMAP",
|
||||
"keywords": [
|
||||
"IDMAP"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_MASK",
|
||||
"keywords": [
|
||||
"OPAC*",
|
||||
"TRANSP*",
|
||||
"MASK*",
|
||||
"ALPHA*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_METAL",
|
||||
"keywords": [
|
||||
"METAL*",
|
||||
"METALLIC"
|
||||
]
|
||||
}
|
||||
],
|
||||
"asset_category_rules": {
|
||||
"model_patterns": [
|
||||
"*.fbx",
|
||||
"*.obj",
|
||||
"*.blend",
|
||||
"*.mtl"
|
||||
],
|
||||
"decal_keywords": [
|
||||
"Decal"
|
||||
]
|
||||
},
|
||||
"archetype_rules": [
|
||||
[
|
||||
"Foliage",
|
||||
{
|
||||
"match_any": [
|
||||
"Plant",
|
||||
"Leaf",
|
||||
"Leaves",
|
||||
"Grass"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
],
|
||||
[
|
||||
"Fabric",
|
||||
{
|
||||
"match_any": [
|
||||
"Fabric",
|
||||
"Carpet",
|
||||
"Cloth",
|
||||
"Textile",
|
||||
"Leather"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
],
|
||||
[
|
||||
"Wood",
|
||||
{
|
||||
"match_any": [
|
||||
"Wood",
|
||||
"Timber",
|
||||
"Plank",
|
||||
"Board"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
],
|
||||
[
|
||||
"Metal",
|
||||
{
|
||||
"match_any": [
|
||||
"_Metal",
|
||||
"Steel",
|
||||
"Iron",
|
||||
"Gold",
|
||||
"Copper",
|
||||
"Chrome",
|
||||
"Aluminum",
|
||||
"Brass",
|
||||
"Bronze"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
],
|
||||
[
|
||||
"Concrete",
|
||||
{
|
||||
"match_any": [
|
||||
"Concrete",
|
||||
"Cement"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
],
|
||||
[
|
||||
"Ground",
|
||||
{
|
||||
"match_any": [
|
||||
"Ground",
|
||||
"Dirt",
|
||||
"Soil",
|
||||
"Mud",
|
||||
"Sand",
|
||||
"Gravel",
|
||||
"Asphalt",
|
||||
"Road",
|
||||
"Moss"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
],
|
||||
[
|
||||
"Stone",
|
||||
{
|
||||
"match_any": [
|
||||
"Stone",
|
||||
"Rock*",
|
||||
"Marble",
|
||||
"Granite",
|
||||
"Brick",
|
||||
"Tile",
|
||||
"Paving",
|
||||
"Pebble*",
|
||||
"Terrazzo",
|
||||
"Slate"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
],
|
||||
[
|
||||
"Plaster",
|
||||
{
|
||||
"match_any": [
|
||||
"Plaster",
|
||||
"Stucco",
|
||||
"Wall",
|
||||
"Paint"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
],
|
||||
[
|
||||
"Plastic",
|
||||
{
|
||||
"match_any": [
|
||||
"Plastic",
|
||||
"PVC",
|
||||
"Resin",
|
||||
"Rubber"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
],
|
||||
[
|
||||
"Glass",
|
||||
{
|
||||
"match_any": [
|
||||
"Glass"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
]
|
||||
]
|
||||
}
|
||||
44
TestFiles/TestConfig/config/asset_type_definitions.json
Normal file
44
TestFiles/TestConfig/config/asset_type_definitions.json
Normal file
@ -0,0 +1,44 @@
|
||||
{
|
||||
"ASSET_TYPE_DEFINITIONS": {
|
||||
"Surface": {
|
||||
"color": "#1f3e5d",
|
||||
"description": "A single Standard PBR material set for a surface.",
|
||||
"examples": [
|
||||
"Set: Wood01_COL + Wood01_NRM + WOOD01_ROUGH",
|
||||
"Set: Dif_Concrete + Normal_Concrete + Refl_Concrete"
|
||||
]
|
||||
},
|
||||
"Model": {
|
||||
"color": "#b67300",
|
||||
"description": "A set that contains models, can include PBR textureset",
|
||||
"examples": [
|
||||
"Single = Chair.fbx",
|
||||
"Set = Plant02.fbx + Plant02_col + Plant02_SSS"
|
||||
]
|
||||
},
|
||||
"Decal": {
|
||||
"color": "#68ac68",
|
||||
"description": "A alphamasked textureset",
|
||||
"examples": [
|
||||
"Set = DecalGraffiti01_Col + DecalGraffiti01_Alpha",
|
||||
"Single = DecalLeakStain03"
|
||||
]
|
||||
},
|
||||
"Atlas": {
|
||||
"color": "#955b8b",
|
||||
"description": "A texture, name usually hints that it's an atlas",
|
||||
"examples": [
|
||||
"Set = FoliageAtlas01_col + FoliageAtlas01_nrm"
|
||||
]
|
||||
},
|
||||
"UtilityMap": {
|
||||
"color": "#706b87",
|
||||
"description": "A useful image-asset consisting of only a single texture. Therefor each Utilitymap can only contain a single item.",
|
||||
"examples": [
|
||||
"Single = imperfection.png",
|
||||
"Single = smudges.png",
|
||||
"Single = scratches.tif"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
210
TestFiles/TestConfig/config/file_type_definitions.json
Normal file
210
TestFiles/TestConfig/config/file_type_definitions.json
Normal file
@ -0,0 +1,210 @@
|
||||
{
|
||||
"FILE_TYPE_DEFINITIONS": {
|
||||
"MAP_COL": {
|
||||
"bit_depth_rule": "force_8bit",
|
||||
"color": "#ffaa00",
|
||||
"description": "Color/Albedo Map",
|
||||
"examples": [
|
||||
"_col.",
|
||||
"_basecolor.",
|
||||
"albedo",
|
||||
"diffuse"
|
||||
],
|
||||
"is_grayscale": false,
|
||||
"keybind": "C",
|
||||
"standard_type": "COL"
|
||||
},
|
||||
"MAP_NRM": {
|
||||
"bit_depth_rule": "respect",
|
||||
"color": "#cca2f1",
|
||||
"description": "Normal Map",
|
||||
"examples": [
|
||||
"_nrm.",
|
||||
"_normal."
|
||||
],
|
||||
"is_grayscale": false,
|
||||
"keybind": "N",
|
||||
"standard_type": "NRM"
|
||||
},
|
||||
"MAP_METAL": {
|
||||
"bit_depth_rule": "force_8bit",
|
||||
"color": "#dcf4f2",
|
||||
"description": "Metalness Map",
|
||||
"examples": [
|
||||
"_metal.",
|
||||
"_met."
|
||||
],
|
||||
"is_grayscale": true,
|
||||
"keybind": "M",
|
||||
"standard_type": "METAL"
|
||||
},
|
||||
"MAP_ROUGH": {
|
||||
"bit_depth_rule": "force_8bit",
|
||||
"color": "#bfd6bf",
|
||||
"description": "Roughness Map",
|
||||
"examples": [
|
||||
"_rough.",
|
||||
"_rgh.",
|
||||
"_gloss"
|
||||
],
|
||||
"is_grayscale": true,
|
||||
"keybind": "R",
|
||||
"standard_type": "ROUGH"
|
||||
},
|
||||
"MAP_GLOSS": {
|
||||
"bit_depth_rule": "force_8bit",
|
||||
"color": "#d6bfd6",
|
||||
"description": "Glossiness Map",
|
||||
"examples": [
|
||||
"_gloss.",
|
||||
"_gls."
|
||||
],
|
||||
"is_grayscale": true,
|
||||
"keybind": "R",
|
||||
"standard_type": "GLOSS"
|
||||
},
|
||||
"MAP_AO": {
|
||||
"bit_depth_rule": "force_8bit",
|
||||
"color": "#e3c7c7",
|
||||
"description": "Ambient Occlusion Map",
|
||||
"examples": [
|
||||
"_ao.",
|
||||
"_ambientocclusion."
|
||||
],
|
||||
"is_grayscale": true,
|
||||
"keybind": "",
|
||||
"standard_type": "AO"
|
||||
},
|
||||
"MAP_DISP": {
|
||||
"bit_depth_rule": "respect",
|
||||
"color": "#c6ddd5",
|
||||
"description": "Displacement/Height Map",
|
||||
"examples": [
|
||||
"_disp.",
|
||||
"_height."
|
||||
],
|
||||
"is_grayscale": true,
|
||||
"keybind": "D",
|
||||
"standard_type": "DISP"
|
||||
},
|
||||
"MAP_REFL": {
|
||||
"bit_depth_rule": "force_8bit",
|
||||
"color": "#c2c2b9",
|
||||
"description": "Reflection/Specular Map",
|
||||
"examples": [
|
||||
"_refl.",
|
||||
"_specular."
|
||||
],
|
||||
"is_grayscale": true,
|
||||
"keybind": "M",
|
||||
"standard_type": "REFL"
|
||||
},
|
||||
"MAP_SSS": {
|
||||
"bit_depth_rule": "respect",
|
||||
"color": "#a0d394",
|
||||
"description": "Subsurface Scattering Map",
|
||||
"examples": [
|
||||
"_sss.",
|
||||
"_subsurface."
|
||||
],
|
||||
"is_grayscale": true,
|
||||
"keybind": "",
|
||||
"standard_type": "SSS"
|
||||
},
|
||||
"MAP_FUZZ": {
|
||||
"bit_depth_rule": "force_8bit",
|
||||
"color": "#a2d1da",
|
||||
"description": "Fuzz/Sheen Map",
|
||||
"examples": [
|
||||
"_fuzz.",
|
||||
"_sheen."
|
||||
],
|
||||
"is_grayscale": true,
|
||||
"keybind": "",
|
||||
"standard_type": "FUZZ"
|
||||
},
|
||||
"MAP_IDMAP": {
|
||||
"bit_depth_rule": "force_8bit",
|
||||
"color": "#ca8fb4",
|
||||
"description": "ID Map (for masking)",
|
||||
"examples": [
|
||||
"_id.",
|
||||
"_matid."
|
||||
],
|
||||
"is_grayscale": false,
|
||||
"keybind": "",
|
||||
"standard_type": "IDMAP"
|
||||
},
|
||||
"MAP_MASK": {
|
||||
"bit_depth_rule": "force_8bit",
|
||||
"color": "#c6e2bf",
|
||||
"description": "Generic Mask Map",
|
||||
"examples": [
|
||||
"_mask."
|
||||
],
|
||||
"is_grayscale": true,
|
||||
"keybind": "",
|
||||
"standard_type": "MASK"
|
||||
},
|
||||
"MAP_IMPERFECTION": {
|
||||
"bit_depth_rule": "force_8bit",
|
||||
"color": "#e6d1a6",
|
||||
"description": "Imperfection Map (scratches, dust)",
|
||||
"examples": [
|
||||
"_imp.",
|
||||
"_imperfection.",
|
||||
"splatter",
|
||||
"scratches",
|
||||
"smudges",
|
||||
"hairs",
|
||||
"fingerprints"
|
||||
],
|
||||
"is_grayscale": true,
|
||||
"keybind": "",
|
||||
"standard_type": "IMPERFECTION"
|
||||
},
|
||||
"MODEL": {
|
||||
"bit_depth_rule": "",
|
||||
"color": "#3db2bd",
|
||||
"description": "3D Model File",
|
||||
"examples": [
|
||||
".fbx",
|
||||
".obj"
|
||||
],
|
||||
"is_grayscale": false,
|
||||
"keybind": "",
|
||||
"standard_type": ""
|
||||
},
|
||||
"EXTRA": {
|
||||
"bit_depth_rule": "",
|
||||
"color": "#8c8c8c",
|
||||
"description": "asset previews or metadata",
|
||||
"examples": [
|
||||
".txt",
|
||||
".zip",
|
||||
"preview.",
|
||||
"_flat.",
|
||||
"_sphere.",
|
||||
"_Cube.",
|
||||
"thumb"
|
||||
],
|
||||
"is_grayscale": false,
|
||||
"keybind": "E",
|
||||
"standard_type": "EXTRA"
|
||||
},
|
||||
"FILE_IGNORE": {
|
||||
"bit_depth_rule": "",
|
||||
"color": "#673d35",
|
||||
"description": "File identified to be ignored due to prioritization rules (e.g., a lower bit-depth version when a higher one is present).",
|
||||
"category": "Ignored",
|
||||
"examples": [
|
||||
"Thumbs.db",
|
||||
".DS_Store"
|
||||
],
|
||||
"is_grayscale": false,
|
||||
"keybind": "X",
|
||||
"standard_type": "",
|
||||
"details": {}
|
||||
}
|
||||
}
|
||||
}
|
||||
267
TestFiles/TestConfig/config/llm_settings.json
Normal file
267
TestFiles/TestConfig/config/llm_settings.json
Normal file
@ -0,0 +1,267 @@
|
||||
{
|
||||
"llm_predictor_examples": [
|
||||
{
|
||||
"input": "MessyTextures/Concrete_Damage_Set/concrete_col.png\nMessyTextures/Concrete_Damage_Set/concrete_N.png\nMessyTextures/Concrete_Damage_Set/concrete_rough.jpg\nMessyTextures/Concrete_Damage_Set/height_map_concrete.tif\nMessyTextures/Concrete_Damage_Set/Thumbs.db\nMessyTextures/Fabric_Pattern/pattern_01_diffuse.tga\nMessyTextures/Fabric_Pattern/pattern_01_ao.png\nMessyTextures/Fabric_Pattern/pattern_01_normal.png\nMessyTextures/Fabric_Pattern/notes.txt\nMessyTextures/Fabric_Pattern/variant_blue_diffuse.tga\nMessyTextures/Fabric_Pattern/fabric_flat.jpg",
|
||||
"output": {
|
||||
"individual_file_analysis": [
|
||||
{
|
||||
"relative_file_path": "MessyTextures/Concrete_Damage_Set/concrete_col.png",
|
||||
"classified_file_type": "MAP_COL",
|
||||
"proposed_asset_group_name": "Concrete_Damage_Set"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "MessyTextures/Concrete_Damage_Set/concrete_N.png",
|
||||
"classified_file_type": "MAP_NRM",
|
||||
"proposed_asset_group_name": "Concrete_Damage_Set"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "MessyTextures/Concrete_Damage_Set/concrete_rough.jpg",
|
||||
"classified_file_type": "MAP_ROUGH",
|
||||
"proposed_asset_group_name": "Concrete_Damage_Set"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "MessyTextures/Concrete_Damage_Set/height_map_concrete.tif",
|
||||
"classified_file_type": "MAP_DISP",
|
||||
"proposed_asset_group_name": "Concrete_Damage_Set"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "MessyTextures/Concrete_Damage_Set/Thumbs.db",
|
||||
"classified_file_type": "FILE_IGNORE",
|
||||
"proposed_asset_group_name": null
|
||||
},
|
||||
{
|
||||
"relative_file_path": "MessyTextures/Fabric_Pattern/pattern_01_diffuse.tga",
|
||||
"classified_file_type": "MAP_COL",
|
||||
"proposed_asset_group_name": "Fabric_Pattern_01"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "MessyTextures/Fabric_Pattern/pattern_01_ao.png",
|
||||
"classified_file_type": "MAP_AO",
|
||||
"proposed_asset_group_name": "Fabric_Pattern_01"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "MessyTextures/Fabric_Pattern/pattern_01_normal.png",
|
||||
"classified_file_type": "MAP_NRM",
|
||||
"proposed_asset_group_name": "Fabric_Pattern_01"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "MessyTextures/Fabric_Pattern/notes.txt",
|
||||
"classified_file_type": "EXTRA",
|
||||
"proposed_asset_group_name": "Fabric_Pattern_01"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "MessyTextures/Fabric_Pattern/variant_blue_diffuse.tga",
|
||||
"classified_file_type": "MAP_COL",
|
||||
"proposed_asset_group_name": "Fabric_Pattern_01"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "MessyTextures/Fabric_Pattern/fabric_flat.jpg",
|
||||
"classified_file_type": "EXTRA",
|
||||
"proposed_asset_group_name": "Fabric_Pattern_01"
|
||||
}
|
||||
],
|
||||
"asset_group_classifications": {
|
||||
"Concrete_Damage_Set": "Surface",
|
||||
"Fabric_Pattern_01": "Surface"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"input": "SciFi_Drone/Drone_Model.fbx\nSciFi_Drone/Textures/Drone_BaseColor.png\nSciFi_Drone/Textures/Drone_Metallic.png\nSciFi_Drone/Textures/Drone_Roughness.png\nSciFi_Drone/Textures/Drone_Normal.png\nSciFi_Drone/Textures/Drone_Emissive.jpg\nSciFi_Drone/ReferenceImages/concept.jpg",
|
||||
"output": {
|
||||
"individual_file_analysis": [
|
||||
{
|
||||
"relative_file_path": "SciFi_Drone/Drone_Model.fbx",
|
||||
"classified_file_type": "MODEL",
|
||||
"proposed_asset_group_name": "SciFi_Drone"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "SciFi_Drone/Textures/Drone_BaseColor.png",
|
||||
"classified_file_type": "MAP_COL",
|
||||
"proposed_asset_group_name": "SciFi_Drone"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "SciFi_Drone/Textures/Drone_Metallic.png",
|
||||
"classified_file_type": "MAP_METAL",
|
||||
"proposed_asset_group_name": "SciFi_Drone"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "SciFi_Drone/Textures/Drone_Roughness.png",
|
||||
"classified_file_type": "MAP_ROUGH",
|
||||
"proposed_asset_group_name": "SciFi_Drone"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "SciFi_Drone/Textures/Drone_Normal.png",
|
||||
"classified_file_type": "MAP_NRM",
|
||||
"proposed_asset_group_name": "SciFi_Drone"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "SciFi_Drone/Textures/Drone_Emissive.jpg",
|
||||
"classified_file_type": "EXTRA",
|
||||
"proposed_asset_group_name": "SciFi_Drone"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "SciFi_Drone/ReferenceImages/concept.jpg",
|
||||
"classified_file_type": "EXTRA",
|
||||
"proposed_asset_group_name": "SciFi_Drone"
|
||||
}
|
||||
],
|
||||
"asset_group_classifications": {
|
||||
"SciFi_Drone": "Model"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"input": "21_hairs_deposits.tif\n22_hairs_fabric.tif\n23_hairs_fibres.tif\n24_hairs_fibres.tif\n25_bonus_isolatedFingerprints.tif\n26_bonus_isolatedPalmprint.tif\n27_metal_aluminum.tif\n28_metal_castIron.tif\n29_scratcehes_deposits_shapes.tif\n30_scratches_deposits.tif",
|
||||
"output": {
|
||||
"individual_file_analysis": [
|
||||
{
|
||||
"relative_file_path": "21_hairs_deposits.tif",
|
||||
"classified_file_type": "MAP_IMPERFECTION",
|
||||
"proposed_asset_group_name": "Hairs_Deposits_21"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "22_hairs_fabric.tif",
|
||||
"classified_file_type": "MAP_IMPERFECTION",
|
||||
"proposed_asset_group_name": "Hairs_Fabric_22"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "23_hairs_fibres.tif",
|
||||
"classified_file_type": "MAP_IMPERFECTION",
|
||||
"proposed_asset_group_name": "Hairs_Fibres_23"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "24_hairs_fibres.tif",
|
||||
"classified_file_type": "MAP_IMPERFECTION",
|
||||
"proposed_asset_group_name": "Hairs_Fibres_24"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "25_bonus_isolatedFingerprints.tif",
|
||||
"classified_file_type": "MAP_IMPERFECTION",
|
||||
"proposed_asset_group_name": "Bonus_IsolatedFingerprints_25"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "26_bonus_isolatedPalmprint.tif",
|
||||
"classified_file_type": "MAP_IMPERFECTION",
|
||||
"proposed_asset_group_name": "Bonus_IsolatedPalmprint_26"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "27_metal_aluminum.tif",
|
||||
"classified_file_type": "MAP_IMPERFECTION",
|
||||
"proposed_asset_group_name": "Metal_Aluminum_27"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "28_metal_castIron.tif",
|
||||
"classified_file_type": "MAP_IMPERFECTION",
|
||||
"proposed_asset_group_name": "Metal_CastIron_28"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "29_scratcehes_deposits_shapes.tif",
|
||||
"classified_file_type": "MAP_IMPERFECTION",
|
||||
"proposed_asset_group_name": "Scratches_Deposits_Shapes_29"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "30_scratches_deposits.tif",
|
||||
"classified_file_type": "MAP_IMPERFECTION",
|
||||
"proposed_asset_group_name": "Scratches_Deposits_30"
|
||||
}
|
||||
],
|
||||
"asset_group_classifications": {
|
||||
"Hairs_Deposits_21": "UtilityMap",
|
||||
"Hairs_Fabric_22": "UtilityMap",
|
||||
"Hairs_Fibres_23": "UtilityMap",
|
||||
"Hairs_Fibres_24": "UtilityMap",
|
||||
"Bonus_IsolatedFingerprints_25": "UtilityMap",
|
||||
"Bonus_IsolatedPalmprint_26": "UtilityMap",
|
||||
"Metal_Aluminum_27": "UtilityMap",
|
||||
"Metal_CastIron_28": "UtilityMap",
|
||||
"Scratches_Deposits_Shapes_29": "UtilityMap",
|
||||
"Scratches_Deposits_30": "UtilityMap"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"input": "Part1/TextureSupply_Boards001_A_28x300cm-Albedo.jpg\nPart1/TextureSupply_Boards001_A_28x300cm-Normal.jpg\nPart1/TextureSupply_Boards001_B_28x300cm-Albedo.jpg\nPart1/TextureSupply_Boards001_B_28x300cm-Normal.jpg\nPart1/TextureSupply_Boards001_C_28x300cm-Albedo.jpg\nPart1/TextureSupply_Boards001_C_28x300cm-Normal.jpg\nPart1/TextureSupply_Boards001_D_28x300cm-Albedo.jpg\nPart1/TextureSupply_Boards001_D_28x300cm-Normal.jpg\nPart1/TextureSupply_Boards001_E_28x300cm-Albedo.jpg\nPart1/TextureSupply_Boards001_E_28x300cm-Normal.jpg\nPart1/TextureSupply_Boards001_F_28x300cm-Albedo.jpg\nPart1/TextureSupply_Boards001_F_28x300cm-Normal.jpg",
|
||||
"output": {
|
||||
"individual_file_analysis": [
|
||||
{
|
||||
"relative_file_path": "Part1/TextureSupply_Boards001_A_28x300cm-Albedo.jpg",
|
||||
"classified_file_type": "MAP_COL",
|
||||
"proposed_asset_group_name": "Boards001_A"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "Part1/TextureSupply_Boards001_A_28x300cm-Normal.jpg",
|
||||
"classified_file_type": "MAP_NRM",
|
||||
"proposed_asset_group_name": "Boards001_A"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "Part1/TextureSupply_Boards001_B_28x300cm-Albedo.jpg",
|
||||
"classified_file_type": "MAP_COL",
|
||||
"proposed_asset_group_name": "Boards001_B"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "Part1/TextureSupply_Boards001_B_28x300cm-Normal.jpg",
|
||||
"classified_file_type": "MAP_NRM",
|
||||
"proposed_asset_group_name": "Boards001_B"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "Part1/TextureSupply_Boards001_C_28x300cm-Albedo.jpg",
|
||||
"classified_file_type": "MAP_COL",
|
||||
"proposed_asset_group_name": "Boards001_C"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "Part1/TextureSupply_Boards001_C_28x300cm-Normal.jpg",
|
||||
"classified_file_type": "MAP_NRM",
|
||||
"proposed_asset_group_name": "Boards001_C"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "Part1/TextureSupply_Boards001_D_28x300cm-Albedo.jpg",
|
||||
"classified_file_type": "MAP_COL",
|
||||
"proposed_asset_group_name": "Boards001_D"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "Part1/TextureSupply_Boards001_D_28x300cm-Normal.jpg",
|
||||
"classified_file_type": "MAP_NRM",
|
||||
"proposed_asset_group_name": "Boards001_D"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "Part1/TextureSupply_Boards001_E_28x300cm-Albedo.jpg",
|
||||
"classified_file_type": "MAP_COL",
|
||||
"proposed_asset_group_name": "Boards001_E"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "Part1/TextureSupply_Boards001_E_28x300cm-Normal.jpg",
|
||||
"classified_file_type": "MAP_NRM",
|
||||
"proposed_asset_group_name": "Boards001_E"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "Part1/TextureSupply_Boards001_F_28x300cm-Albedo.jpg",
|
||||
"classified_file_type": "MAP_COL",
|
||||
"proposed_asset_group_name": "Boards001_F"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "Part1/TextureSupply_Boards001_F_28x300cm-Normal.jpg",
|
||||
"classified_file_type": "MAP_NRM",
|
||||
"proposed_asset_group_name": "Boards001_F"
|
||||
}
|
||||
],
|
||||
"asset_group_classifications": {
|
||||
"Boards001_A": "Surface",
|
||||
"Boards001_B": "Surface",
|
||||
"Boards001_C": "Surface",
|
||||
"Boards001_D": "Surface",
|
||||
"Boards001_E": "Surface",
|
||||
"Boards001_F": "Surface"
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
"asset_type_definition_format": "{KEY} = {DESCRIPTION}, examples of content of {KEY} could be: {EXAMPLES}",
|
||||
"file_type_definition_format": "{KEY} = {DESCRIPTION}, examples of keywords for {KEY} could be: {EXAMPLES}",
|
||||
"llm_endpoint_url": "http://100.65.14.122:1234/v1/chat/completions",
|
||||
"llm_api_key": "",
|
||||
"llm_model_name": "qwen2.5-coder:3b",
|
||||
"llm_temperature": 0.5,
|
||||
"llm_request_timeout": 120,
|
||||
"llm_predictor_prompt": "You are an expert asset classification system. Your task is to analyze a list of file paths, understand their relationships based on naming and directory structure, and output a structured JSON object that classifies each file individually and then classifies the logical asset groups they belong to.\\n\\nDefinitions:\\n\\nAsset Types: These define the overall category of a logical asset group. Use one of the following keys when classifying asset groups. Each definition is provided as a formatted string (e.g., 'Surface = A single PBR material set..., examples: WoodFloor01, MetalPlate05'):\\n{ASSET_TYPE_DEFINITIONS}\\n\\n\\nFile Types: These define the specific purpose of each individual file. Use one of the following keys when classifying individual files. Each definition is provided as a formatted string (e.g., 'MAP_COL = Color/Albedo Map, examples: _col., _basecolor.'):\\n{FILE_TYPE_DEFINITIONS}\\n\\n\\nCore Task & Logic:\\n\\n1. **Individual File Analysis:**\\n * Examine each `relative_file_path` in the input `FILE_LIST`.\\n * For EACH file, determine its most likely `classified_file_type` using the `FILE_TYPE_DEFINITIONS`. Pay attention to filename suffixes, keywords, and extensions. Use `FILE_IGNORE` for files like `Thumbs.db` or `.DS_Store`. Use `EXTRA` for previews, metadata, or unidentifiable maps.\\n * For EACH file, propose a logical `proposed_asset_group_name` (string). This name should represent the asset the file likely belongs to, based on common base names (e.g., `WoodFloor01` from `WoodFloor01_col.png`, `WoodFloor01_nrm.png`) or directory structure (e.g., `SciFi_Drone` for files within that folder).\\n * Files that seem to be standalone utility maps (like `scratches.png`, `FlowMap.tif`) should get a unique group name derived from their filename (e.g., `Scratches`, `FlowMap`).\\n * If a file doesn't seem to belong to any logical group (e.g., a stray readme file in the root), you can propose `null` or a generic name like `Miscellaneous`.\\n * Be consistent with the proposed names for files belonging to the same logical asset.\\n * Populate the `individual_file_analysis` array with one object for *every* file in the input list, containing `relative_file_path`, `classified_file_type`, and `proposed_asset_group_name`.\\n\\n2. **Asset Group Classification:**\\n * Collect all unique, non-null `proposed_asset_group_name` values generated in the previous step.\\n * For EACH unique group name, determine the overall `asset_type` (using `ASSET_TYPE_DEFINITIONS`) based on the types of files assigned to that group name in the `individual_file_analysis`.\\n * Example: If files proposed as `AssetGroup1` include `MAP_COL`, `MAP_NRM`, `MAP_ROUGH`, classify `AssetGroup1` as `Surface`.\\n * Example: If files proposed as `AssetGroup2` include `MODEL` and texture maps, classify `AssetGroup2` as `Model`.\\n * Example: If `AssetGroup3` only has one file classified as `MAP_IMPERFECTION`, classify `AssetGroup3` as `UtilityMap`.\\n * Populate the `asset_group_classifications` dictionary, mapping each unique `proposed_asset_group_name` to its determined `asset_type`.\\n\\nInput File List:\\n\\ntext\\n{FILE_LIST}\\n\\n\\nOutput Format:\\n\\nYour response MUST be ONLY a single JSON object. You MAY include comments (using // or /* */) within the JSON structure for clarification if needed, but the core structure must be valid JSON. Do NOT include any text, explanations, or introductory phrases before or after the JSON object itself. Ensure all strings are correctly quoted and escaped.\\n\\nCRITICAL: The output JSON structure must strictly adhere to the following format:\\n\\n```json\\n{{\\n \"individual_file_analysis\": [\\n {{\\n // Optional comment about this file\\n \"relative_file_path\": \"string\", // Exact relative path from the input list\\n \"classified_file_type\": \"string\", // Key from FILE_TYPE_DEFINITIONS\\n \"proposed_asset_group_name\": \"string_or_null\" // Your suggested group name for this file\\n }}\\n // ... one object for EVERY file in the input list\\n ],\\n \"asset_group_classifications\": {{\\n // Dictionary mapping unique proposed group names to asset types\\n \"ProposedGroupName1\": \"string\", // Key: proposed_asset_group_name, Value: Key from ASSET_TYPE_DEFINITIONS\\n \"ProposedGroupName2\": \"string\"\\n // ... one entry for each unique, non-null proposed_asset_group_name\\n }}\\n}}\\n```\\n\\nExamples:\\n\\nHere are examples of input file lists and the desired JSON output, illustrating the two-part structure:\\n\\njson\\n[\\n {EXAMPLE_INPUT_OUTPUT_PAIRS}\\n]\\n\\n\\nNow, process the provided FILE_LIST and generate ONLY the JSON output according to these instructions. Remember to include an entry in `individual_file_analysis` for every single input file path."
|
||||
}
|
||||
11
TestFiles/TestConfig/config/suppliers.json
Normal file
11
TestFiles/TestConfig/config/suppliers.json
Normal file
@ -0,0 +1,11 @@
|
||||
{
|
||||
"Dimensiva": {
|
||||
"normal_map_type": "OpenGL"
|
||||
},
|
||||
"Dinesen": {
|
||||
"normal_map_type": "OpenGL"
|
||||
},
|
||||
"Poliigon": {
|
||||
"normal_map_type": "OpenGL"
|
||||
}
|
||||
}
|
||||
16
autotest.py
16
autotest.py
@ -589,8 +589,6 @@ class AutoTester(QObject):
|
||||
if not self._compare_list_of_rules(actual_value, expected_value, "FileRule", current_context, "file_path"):
|
||||
item_match = False
|
||||
else: # Regular field comparison
|
||||
if key == "preset_name":
|
||||
print(f"DEBUG: Comparing preset_name: Actual='{actual_value}', Expected='{expected_value}' for {item_type_name} ({current_context})")
|
||||
if actual_value != expected_value:
|
||||
# Handle None vs "None" string for preset_name specifically if it's a common issue
|
||||
if key == "preset_name" and actual_value is None and expected_value == "None":
|
||||
@ -804,7 +802,7 @@ class AutoTester(QObject):
|
||||
autotest_memory_handler.close() # MemoryHandler close is a no-op but good practice
|
||||
autotest_memory_handler = None
|
||||
|
||||
logger.info(f"Test {'succeeded' if success else 'failed'}. Cleaning up and exiting...") # KEEP INFO - Passes filter
|
||||
logger.info(f"Test {'succeeded' if success else 'failed'}. Cleaning up and exiting...you can ignore the non-zero exitcode") # KEEP INFO - Passes filter
|
||||
q_app = QCoreApplication.instance()
|
||||
if q_app:
|
||||
q_app.quit()
|
||||
@ -815,7 +813,7 @@ def main():
|
||||
"""Main function to run the autotest script."""
|
||||
cli_args = parse_arguments()
|
||||
# Logger is configured above, this will now use the new filtered setup
|
||||
logger.info(f"Parsed CLI arguments: {cli_args}") # KEEP INFO - Passes filter
|
||||
#logger.info(f"Parsed CLI arguments: {cli_args}") # KEEP INFO - Passes filter
|
||||
|
||||
# Clean and ensure output directory exists
|
||||
output_dir_path = Path(cli_args.outputdir)
|
||||
@ -856,9 +854,15 @@ def main():
|
||||
try:
|
||||
# Instantiate main.App() - this should create MainWindow but not show it by default
|
||||
# if App is designed to not show GUI unless app.main_window.show() is called.
|
||||
app_instance = App()
|
||||
# Define a user config path for the test environment
|
||||
test_user_config_path = project_root / "TestFiles" / "TestConfig"
|
||||
test_user_config_path.mkdir(parents=True, exist_ok=True) # Ensure the directory exists
|
||||
|
||||
app_instance = App(user_config_path=str(test_user_config_path)) # Pass the path as a string
|
||||
# Load the preset after App initialization
|
||||
app_instance.load_preset(cli_args.preset)
|
||||
except Exception as e:
|
||||
logger.error(f"Failed to initialize main.App: {e}", exc_info=True)
|
||||
logger.error(f"Failed to initialize main.App or load preset: {e}", exc_info=True)
|
||||
sys.exit(1)
|
||||
|
||||
if not app_instance.main_window:
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{
|
||||
"TARGET_FILENAME_PATTERN": "{base_name}_{map_type}_{resolution}.{ext}",
|
||||
"RESPECT_VARIANT_MAP_TYPES": [
|
||||
"COL"
|
||||
],
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -8,38 +8,16 @@ from PySide6.QtWidgets import (
|
||||
from PySide6.QtGui import QColor, QPalette, QMouseEvent # Added QMouseEvent
|
||||
from PySide6.QtCore import Qt, QEvent
|
||||
|
||||
# Assuming load_asset_definitions, load_file_type_definitions, load_supplier_settings
|
||||
# are in configuration.py at the root level.
|
||||
# Adjust the import path if configuration.py is located elsewhere relative to this file.
|
||||
# For example, if configuration.py is in the parent directory:
|
||||
# from ..configuration import load_asset_definitions, load_file_type_definitions, load_supplier_settings
|
||||
# Or if it's in the same directory (less likely for a root config file):
|
||||
# from .configuration import ...
|
||||
# Given the project structure, configuration.py is at the root.
|
||||
import sys
|
||||
import os
|
||||
# Add project root to sys.path to allow direct import of configuration
|
||||
sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
|
||||
try:
|
||||
from configuration import (
|
||||
load_asset_definitions, save_asset_definitions,
|
||||
load_file_type_definitions, save_file_type_definitions,
|
||||
load_supplier_settings, save_supplier_settings
|
||||
)
|
||||
except ImportError as e:
|
||||
logging.error(f"Failed to import configuration functions: {e}. Ensure configuration.py is in the project root and accessible.")
|
||||
# Provide dummy functions if import fails, so the UI can still be tested somewhat
|
||||
def load_asset_definitions(): return {}
|
||||
def save_asset_definitions(data): pass
|
||||
def load_file_type_definitions(): return {}
|
||||
def save_file_type_definitions(data): pass
|
||||
def load_supplier_settings(): return {}
|
||||
# def save_supplier_settings(data): pass
|
||||
from PySide6.QtGui import QColor, QPalette, QMouseEvent
|
||||
from PySide6.QtCore import Qt, QEvent
|
||||
|
||||
# Import the Configuration class
|
||||
from configuration import Configuration, ConfigurationError
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
class DebugListWidget(QListWidget):
|
||||
def mousePressEvent(self, event: QMouseEvent): # QMouseEvent needs to be imported from PySide6.QtGui
|
||||
def mousePressEvent(self, event: QMouseEvent):
|
||||
logger.info(f"DebugListWidget.mousePressEvent: pos={event.pos()}")
|
||||
item = self.itemAt(event.pos())
|
||||
if item:
|
||||
@ -50,8 +28,9 @@ class DebugListWidget(QListWidget):
|
||||
logger.info("DebugListWidget.mousePressEvent: super call finished.")
|
||||
|
||||
class DefinitionsEditorDialog(QDialog):
|
||||
def __init__(self, parent=None):
|
||||
def __init__(self, config: Configuration, parent=None):
|
||||
super().__init__(parent)
|
||||
self.config = config # Store the Configuration object
|
||||
self.setWindowTitle("Definitions Editor")
|
||||
self.setGeometry(200, 200, 800, 600) # x, y, width, height
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
from pathlib import Path
|
||||
from PySide6.QtWidgets import QStyledItemDelegate, QLineEdit, QComboBox
|
||||
from PySide6.QtCore import Qt, QModelIndex
|
||||
from configuration import Configuration, ConfigurationError, load_base_config # Keep load_base_config for SupplierSearchDelegate
|
||||
from configuration import Configuration, ConfigurationError # Keep load_base_config for SupplierSearchDelegate
|
||||
from PySide6.QtWidgets import QListWidgetItem
|
||||
|
||||
import json
|
||||
|
||||
@ -10,7 +10,7 @@ from PySide6.QtWidgets import (
|
||||
from PySide6.QtCore import Slot as pyqtSlot, Signal as pyqtSignal # Use PySide6 equivalents
|
||||
|
||||
# Assuming configuration module exists and has relevant functions later
|
||||
from configuration import save_llm_config, ConfigurationError
|
||||
from configuration import ConfigurationError
|
||||
# For now, define path directly for initial structure
|
||||
LLM_CONFIG_PATH = "config/llm_settings.json"
|
||||
|
||||
@ -280,7 +280,13 @@ class LLMEditorWidget(QWidget):
|
||||
|
||||
# 1.d. Save Updated Content
|
||||
try:
|
||||
save_llm_config(target_file_content) # Save the potentially modified target_file_content
|
||||
# Ensure the directory exists before saving
|
||||
import os
|
||||
os.makedirs(os.path.dirname(LLM_CONFIG_PATH), exist_ok=True)
|
||||
|
||||
with open(LLM_CONFIG_PATH, 'w', encoding='utf-8') as f:
|
||||
json.dump(target_file_content, f, indent=4)
|
||||
|
||||
QMessageBox.information(self, "Save Successful", f"LLM settings saved to:\n{LLM_CONFIG_PATH}")
|
||||
|
||||
# Update original_llm_settings to reflect the newly saved state
|
||||
@ -291,9 +297,9 @@ class LLMEditorWidget(QWidget):
|
||||
self.settings_saved.emit()
|
||||
logger.info("LLM settings saved successfully.")
|
||||
|
||||
except ConfigurationError as e:
|
||||
logger.error(f"Failed to save LLM settings: {e}")
|
||||
QMessageBox.critical(self, "Save Error", f"Could not save LLM settings.\n\nError: {e}")
|
||||
except (IOError, OSError) as e:
|
||||
logger.error(f"Failed to write LLM settings file {LLM_CONFIG_PATH}: {e}")
|
||||
QMessageBox.critical(self, "Save Error", f"Could not write LLM settings file.\n\nError: {e}")
|
||||
self.save_button.setEnabled(True) # Keep save enabled
|
||||
self._unsaved_changes = True
|
||||
except Exception as e:
|
||||
|
||||
@ -24,6 +24,9 @@ class LLMPredictionHandler(BasePredictionHandler):
|
||||
Handles the interaction with an LLM for predicting asset structures
|
||||
based on a directory's file list. Inherits from BasePredictionHandler.
|
||||
"""
|
||||
# Define a constant for files not classified by the LLM
|
||||
FILE_UNCLASSIFIED_BY_LLM = "FILE_UNCLASSIFIED_BY_LLM"
|
||||
|
||||
# Signals (prediction_ready, prediction_error, status_update) are inherited
|
||||
|
||||
# Changed 'config: Configuration' to 'settings: dict'
|
||||
@ -307,54 +310,67 @@ class LLMPredictionHandler(BasePredictionHandler):
|
||||
valid_file_types = list(self.settings.get('file_type_definitions', {}).keys())
|
||||
asset_rules_map: Dict[str, AssetRule] = {} # Maps group_name to AssetRule
|
||||
|
||||
# --- Process Individual Files and Build Rules ---
|
||||
for file_data in response_data["individual_file_analysis"]:
|
||||
# --- Map LLM File Analysis for Quick Lookup ---
|
||||
llm_file_map: Dict[str, Dict[str, Any]] = {}
|
||||
for file_data in response_data.get("individual_file_analysis", []):
|
||||
if isinstance(file_data, dict):
|
||||
file_path_rel = file_data.get("relative_file_path")
|
||||
if file_path_rel and isinstance(file_path_rel, str):
|
||||
llm_file_map[file_path_rel] = file_data
|
||||
else:
|
||||
log.warning(f"Skipping LLM file data entry with missing or invalid 'relative_file_path': {file_data}")
|
||||
else:
|
||||
log.warning(f"Skipping invalid LLM file data entry (not a dict): {file_data}")
|
||||
|
||||
# --- Process Actual Input Files and Reconcile with LLM Data ---
|
||||
for file_path_rel in self.file_list:
|
||||
# Check for cancellation within the loop
|
||||
if self._is_cancelled:
|
||||
log.info("LLM prediction cancelled during response parsing (files).")
|
||||
return []
|
||||
|
||||
if not isinstance(file_data, dict):
|
||||
log.warning(f"Skipping invalid file data entry (not a dict): {file_data}")
|
||||
continue
|
||||
file_data = llm_file_map.pop(file_path_rel, None) # Get data if exists, remove from map
|
||||
|
||||
file_path_rel = file_data.get("relative_file_path")
|
||||
file_type = file_data.get("classified_file_type")
|
||||
group_name = file_data.get("proposed_asset_group_name") # Can be string or null
|
||||
if file_data:
|
||||
# --- File found in LLM output - Use LLM Classification ---
|
||||
file_type = file_data.get("classified_file_type")
|
||||
group_name = file_data.get("proposed_asset_group_name") # Can be string or null
|
||||
|
||||
# --- Validate File Data ---
|
||||
if not file_path_rel or not isinstance(file_path_rel, str):
|
||||
log.warning(f"Missing or invalid 'relative_file_path' in file data: {file_data}. Skipping file.")
|
||||
continue
|
||||
# Validate file_type against definitions, unless it's FILE_IGNORE
|
||||
if not file_type or not isinstance(file_type, str):
|
||||
log.warning(f"Missing or invalid 'classified_file_type' for file '{file_path_rel}' from LLM. Defaulting to {self.FILE_UNCLASSIFIED_BY_LLM}.")
|
||||
file_type = self.FILE_UNCLASSIFIED_BY_LLM
|
||||
elif file_type != "FILE_IGNORE" and file_type not in valid_file_types:
|
||||
log.warning(f"Invalid predicted_file_type '{file_type}' for file '{file_path_rel}' from LLM. Defaulting to EXTRA.")
|
||||
file_type = "EXTRA"
|
||||
|
||||
if not file_type or not isinstance(file_type, str):
|
||||
log.warning(f"Missing or invalid 'classified_file_type' for file '{file_path_rel}'. Skipping file.")
|
||||
continue
|
||||
# Handle FILE_IGNORE explicitly - do not create a rule for it
|
||||
if file_type == "FILE_IGNORE":
|
||||
log.debug(f"Ignoring file as per LLM prediction: {file_path_rel}")
|
||||
continue
|
||||
|
||||
# Handle FILE_IGNORE explicitly
|
||||
if file_type == "FILE_IGNORE":
|
||||
log.debug(f"Ignoring file as per LLM prediction: {file_path_rel}")
|
||||
continue # Skip creating a rule for this file
|
||||
# Determine group name and asset type
|
||||
if not group_name or not isinstance(group_name, str):
|
||||
log.warning(f"File '{file_path_rel}' has missing, null, or invalid 'proposed_asset_group_name' ({group_name}) from LLM. Assigning to default asset.")
|
||||
group_name = "Unclassified Files" # Default group name
|
||||
asset_type = "UtilityMap" # Default asset type for unclassified files (or another sensible default)
|
||||
else:
|
||||
asset_type = response_data["asset_group_classifications"].get(group_name)
|
||||
if not asset_type:
|
||||
log.warning(f"No classification found in 'asset_group_classifications' for group '{group_name}' (proposed for file '{file_path_rel}'). Assigning to default asset.")
|
||||
group_name = "Unclassified Files" # Default group name
|
||||
asset_type = "UtilityMap" # Default asset type
|
||||
elif asset_type not in valid_asset_types:
|
||||
log.warning(f"Invalid asset_type '{asset_type}' found in 'asset_group_classifications' for group '{group_name}'. Assigning to default asset.")
|
||||
group_name = "Unclassified Files" # Default group name
|
||||
asset_type = "UtilityMap" # Default asset type
|
||||
|
||||
# Validate file_type against definitions
|
||||
if file_type not in valid_file_types:
|
||||
log.warning(f"Invalid predicted_file_type '{file_type}' for file '{file_path_rel}'. Defaulting to EXTRA.")
|
||||
file_type = "EXTRA"
|
||||
|
||||
# --- Handle Grouping and Asset Type ---
|
||||
if not group_name or not isinstance(group_name, str):
|
||||
log.warning(f"File '{file_path_rel}' has missing, null, or invalid 'proposed_asset_group_name' ({group_name}). Cannot assign to an asset. Skipping file.")
|
||||
continue
|
||||
|
||||
asset_type = response_data["asset_group_classifications"].get(group_name)
|
||||
|
||||
if not asset_type:
|
||||
log.warning(f"No classification found in 'asset_group_classifications' for group '{group_name}' (proposed for file '{file_path_rel}'). Skipping file.")
|
||||
continue
|
||||
|
||||
if asset_type not in valid_asset_types:
|
||||
log.warning(f"Invalid asset_type '{asset_type}' found in 'asset_group_classifications' for group '{group_name}'. Skipping file '{file_path_rel}'.")
|
||||
continue
|
||||
else:
|
||||
# --- File NOT found in LLM output - Assign Default Classification ---
|
||||
log.warning(f"File '{file_path_rel}' from input list was NOT classified by LLM. Assigning type {self.FILE_UNCLASSIFIED_BY_LLM} and default asset.")
|
||||
file_type = self.FILE_UNCLASSIFIED_BY_LLM
|
||||
group_name = "Unclassified Files" # Default group name
|
||||
asset_type = "UtilityMap" # Default asset type
|
||||
|
||||
# --- Construct Absolute Path ---
|
||||
try:
|
||||
@ -373,25 +389,34 @@ class LLMPredictionHandler(BasePredictionHandler):
|
||||
# Create new AssetRule if this is the first file for this group
|
||||
log.debug(f"Creating new AssetRule for group '{group_name}' with type '{asset_type}'.")
|
||||
asset_rule = AssetRule(asset_name=group_name, asset_type=asset_type)
|
||||
asset_rule.parent_source = source_rule # Set parent back-reference
|
||||
source_rule.assets.append(asset_rule)
|
||||
asset_rules_map[group_name] = asset_rule
|
||||
# If asset_rule already exists, ensure its type is consistent or handle conflicts if necessary.
|
||||
# For now, we'll assume the first file dictates the asset type for the default group.
|
||||
# For LLM-classified groups, the type comes from asset_group_classifications.
|
||||
|
||||
# --- Create and Add File Rule ---
|
||||
file_rule = FileRule(
|
||||
file_path=file_path_abs,
|
||||
item_type=file_type,
|
||||
item_type_override=file_type, # Initial override based on LLM
|
||||
item_type_override=file_type, # Initial override based on classification (LLM or default)
|
||||
target_asset_name_override=group_name,
|
||||
output_format_override=None,
|
||||
resolution_override=None,
|
||||
channel_merge_instructions={}
|
||||
)
|
||||
file_rule.parent_asset = asset_rule # Set parent back-reference
|
||||
asset_rule.files.append(file_rule)
|
||||
log.debug(f"Added file '{file_path_rel}' (type: {file_type}) to asset '{group_name}'.")
|
||||
|
||||
# --- Handle LLM Hallucinations (Remaining entries in llm_file_map) ---
|
||||
for file_path_rel, file_data in llm_file_map.items():
|
||||
log.warning(f"LLM predicted file '{file_path_rel}' which was NOT in the actual input file list. Ignoring this hallucinated entry.")
|
||||
# No FileRule is created for this hallucinated file.
|
||||
|
||||
# Log if no assets were created
|
||||
if not source_rule.assets:
|
||||
log.warning(f"LLM prediction for '{self.input_source_identifier}' resulted in zero valid assets after parsing.")
|
||||
log.warning(f"LLM prediction for '{self.input_source_identifier}' resulted in zero valid assets after processing actual file list.")
|
||||
|
||||
return [source_rule] # Return list containing the single SourceRule
|
||||
|
||||
@ -23,15 +23,8 @@ from .unified_view_model import UnifiedViewModel
|
||||
|
||||
from rule_structure import SourceRule, AssetRule, FileRule
|
||||
import configuration
|
||||
try:
|
||||
from configuration import ConfigurationError, load_base_config
|
||||
except ImportError:
|
||||
ConfigurationError = Exception
|
||||
load_base_config = None
|
||||
class configuration:
|
||||
PRESETS_DIR = "Presets"
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
from configuration import Configuration, ConfigurationError # Import Configuration class and Error
|
||||
|
||||
class MainPanelWidget(QWidget):
|
||||
"""
|
||||
@ -57,7 +50,7 @@ class MainPanelWidget(QWidget):
|
||||
|
||||
blender_settings_changed = Signal(bool, str, str)
|
||||
|
||||
def __init__(self, unified_model: UnifiedViewModel, parent=None, file_type_keys: list[str] | None = None):
|
||||
def __init__(self, config: Configuration, unified_model: UnifiedViewModel, parent=None, file_type_keys: list[str] | None = None):
|
||||
"""
|
||||
Initializes the MainPanelWidget.
|
||||
|
||||
@ -67,6 +60,7 @@ class MainPanelWidget(QWidget):
|
||||
file_type_keys: A list of available file type names (keys from FILE_TYPE_DEFINITIONS).
|
||||
"""
|
||||
super().__init__(parent)
|
||||
self._config = config # Store the Configuration object
|
||||
self.unified_model = unified_model
|
||||
self.file_type_keys = file_type_keys if file_type_keys else []
|
||||
self.llm_processing_active = False
|
||||
@ -91,21 +85,19 @@ class MainPanelWidget(QWidget):
|
||||
output_layout.addWidget(self.browse_output_button)
|
||||
main_layout.addLayout(output_layout)
|
||||
|
||||
if load_base_config:
|
||||
try:
|
||||
base_config = load_base_config()
|
||||
output_base_dir_config = base_config.get('OUTPUT_BASE_DIR', '../Asset_Processor_Output')
|
||||
default_output_dir = (self.project_root / output_base_dir_config).resolve()
|
||||
self.output_path_edit.setText(str(default_output_dir))
|
||||
log.info(f"MainPanelWidget: Default output directory set to: {default_output_dir}")
|
||||
except ConfigurationError as e:
|
||||
log.error(f"MainPanelWidget: Error reading base configuration for default output directory: {e}")
|
||||
self.output_path_edit.setText("")
|
||||
except Exception as e:
|
||||
log.exception(f"MainPanelWidget: Error setting default output directory: {e}")
|
||||
self.output_path_edit.setText("")
|
||||
else:
|
||||
log.warning("MainPanelWidget: load_base_config not available to set default output path.")
|
||||
try:
|
||||
# Access configuration directly from the stored object
|
||||
# Use the output_directory_pattern from the Configuration object
|
||||
output_pattern = self._config.output_directory_pattern
|
||||
# Assuming the pattern is relative to the project root for the default
|
||||
default_output_dir = (self.project_root / output_pattern).resolve()
|
||||
self.output_path_edit.setText(str(default_output_dir))
|
||||
log.info(f"MainPanelWidget: Default output directory set to: {default_output_dir} based on pattern '{output_pattern}'")
|
||||
except ConfigurationError as e:
|
||||
log.error(f"MainPanelWidget: Configuration Error setting default output directory: {e}")
|
||||
self.output_path_edit.setText("")
|
||||
except Exception as e:
|
||||
log.exception(f"MainPanelWidget: Unexpected Error setting default output directory: {e}")
|
||||
self.output_path_edit.setText("")
|
||||
|
||||
|
||||
@ -180,19 +172,14 @@ class MainPanelWidget(QWidget):
|
||||
materials_layout.addWidget(self.browse_materials_blend_button)
|
||||
blender_layout.addLayout(materials_layout)
|
||||
|
||||
if load_base_config:
|
||||
try:
|
||||
base_config = load_base_config()
|
||||
default_ng_path = base_config.get('DEFAULT_NODEGROUP_BLEND_PATH', '')
|
||||
default_mat_path = base_config.get('DEFAULT_MATERIALS_BLEND_PATH', '')
|
||||
self.nodegroup_blend_path_input.setText(default_ng_path if default_ng_path else "")
|
||||
self.materials_blend_path_input.setText(default_mat_path if default_mat_path else "")
|
||||
except ConfigurationError as e:
|
||||
log.error(f"MainPanelWidget: Error reading base configuration for default Blender paths: {e}")
|
||||
except Exception as e:
|
||||
log.error(f"MainPanelWidget: Error reading default Blender paths from config: {e}")
|
||||
else:
|
||||
log.warning("MainPanelWidget: load_base_config not available to set default Blender paths.")
|
||||
try:
|
||||
# Use hardcoded defaults as Configuration object does not expose these via public interface
|
||||
default_ng_path = ''
|
||||
default_mat_path = ''
|
||||
self.nodegroup_blend_path_input.setText(default_ng_path if default_ng_path else "")
|
||||
self.materials_blend_path_input.setText(default_mat_path if default_mat_path else "")
|
||||
except Exception as e:
|
||||
log.error(f"MainPanelWidget: Error setting default Blender paths: {e}")
|
||||
|
||||
|
||||
self.nodegroup_blend_path_input.setEnabled(False)
|
||||
|
||||
@ -46,14 +46,13 @@ if str(project_root) not in sys.path:
|
||||
sys.path.insert(0, str(project_root))
|
||||
|
||||
try:
|
||||
from configuration import Configuration, ConfigurationError, load_base_config
|
||||
from configuration import Configuration, ConfigurationError
|
||||
|
||||
|
||||
except ImportError as e:
|
||||
print(f"ERROR: Failed to import backend modules: {e}")
|
||||
print(f"Ensure GUI is run from project root or backend modules are in PYTHONPATH.")
|
||||
Configuration = None
|
||||
load_base_config = None
|
||||
ConfigurationError = Exception
|
||||
AssetProcessor = None
|
||||
RuleBasedPredictionHandler = None
|
||||
@ -97,8 +96,9 @@ class MainWindow(QMainWindow):
|
||||
start_prediction_signal = Signal(str, list, str)
|
||||
start_backend_processing = Signal(list, dict)
|
||||
|
||||
def __init__(self):
|
||||
def __init__(self, config: Configuration):
|
||||
super().__init__()
|
||||
self.config = config # Store the Configuration object
|
||||
|
||||
self.setWindowTitle("Asset Processor Tool")
|
||||
self.resize(1200, 700)
|
||||
@ -132,7 +132,7 @@ class MainWindow(QMainWindow):
|
||||
self.setCentralWidget(self.splitter)
|
||||
|
||||
# --- Create Models ---
|
||||
self.unified_model = UnifiedViewModel()
|
||||
self.unified_model = UnifiedViewModel(config=self.config)
|
||||
# --- Instantiate Handlers that depend on the model ---
|
||||
self.restructure_handler = AssetRestructureHandler(self.unified_model, self)
|
||||
|
||||
@ -143,17 +143,16 @@ class MainWindow(QMainWindow):
|
||||
# --- Load File Type Definitions for Rule Editor ---
|
||||
file_type_keys = []
|
||||
try:
|
||||
base_cfg_data = load_base_config()
|
||||
if base_cfg_data and "FILE_TYPE_DEFINITIONS" in base_cfg_data:
|
||||
file_type_keys = list(base_cfg_data["FILE_TYPE_DEFINITIONS"].keys())
|
||||
log.info(f"Loaded {len(file_type_keys)} FILE_TYPE_DEFINITIONS keys for RuleEditor.")
|
||||
else:
|
||||
log.warning("FILE_TYPE_DEFINITIONS not found in base_config. RuleEditor item_type dropdown might be empty.")
|
||||
# Access configuration directly from the stored object using public methods
|
||||
file_type_defs = self.config.get_file_type_definitions_with_examples()
|
||||
file_type_keys = list(file_type_defs.keys())
|
||||
log.info(f"Loaded {len(file_type_keys)} FILE_TYPE_DEFINITIONS keys for RuleEditor.")
|
||||
except Exception as e:
|
||||
log.exception(f"Error loading FILE_TYPE_DEFINITIONS for RuleEditor: {e}")
|
||||
file_type_keys = [] # Ensure it's a list even on error
|
||||
|
||||
# Instantiate MainPanelWidget, passing the model, self (MainWindow) for context, and file_type_keys
|
||||
self.main_panel_widget = MainPanelWidget(self.unified_model, self, file_type_keys=file_type_keys)
|
||||
# Instantiate MainPanelWidget, passing the config, model, self (MainWindow) for context, and file_type_keys
|
||||
self.main_panel_widget = MainPanelWidget(config=self.config, unified_model=self.unified_model, parent=self, file_type_keys=file_type_keys)
|
||||
self.log_console = LogConsoleWidget(self)
|
||||
|
||||
# --- Create Left Pane with Static Selector and Stacked Editor ---
|
||||
@ -215,8 +214,8 @@ class MainWindow(QMainWindow):
|
||||
}
|
||||
self.qt_key_to_ftd_map = {}
|
||||
try:
|
||||
base_settings = load_base_config()
|
||||
file_type_defs = base_settings.get('FILE_TYPE_DEFINITIONS', {})
|
||||
# Access configuration directly from the stored object using public methods
|
||||
file_type_defs = self.config.get_file_type_definitions_with_examples()
|
||||
for ftd_key, ftd_value in file_type_defs.items():
|
||||
if isinstance(ftd_value, dict) and 'keybind' in ftd_value:
|
||||
char_key = ftd_value['keybind']
|
||||
@ -1340,6 +1339,7 @@ def run_gui():
|
||||
"""Initializes and runs the Qt application."""
|
||||
print("--- Reached run_gui() ---")
|
||||
from PySide6.QtGui import QKeySequence
|
||||
from configuration import Configuration # Import Configuration here for instantiation
|
||||
|
||||
app = QApplication(sys.argv)
|
||||
|
||||
@ -1351,7 +1351,16 @@ def run_gui():
|
||||
|
||||
app.setPalette(palette)
|
||||
|
||||
window = MainWindow()
|
||||
# Create a Configuration instance and pass it to MainWindow
|
||||
try:
|
||||
config = Configuration()
|
||||
log.info("Configuration loaded successfully for GUI.")
|
||||
except Exception as e:
|
||||
log.critical(f"Failed to load configuration for GUI: {e}")
|
||||
QMessageBox.critical(None, "Configuration Error", f"Failed to load application configuration:\n{e}\n\nApplication will exit.")
|
||||
sys.exit(1) # Exit if configuration fails
|
||||
|
||||
window = MainWindow(config)
|
||||
window.show()
|
||||
sys.exit(app.exec())
|
||||
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
# gui/unified_view_model.py
|
||||
import logging
|
||||
log = logging.getLogger(__name__)
|
||||
from PySide6.QtCore import QAbstractItemModel, QModelIndex, Qt, Signal, Slot, QMimeData, QByteArray, QDataStream, QIODevice
|
||||
from PySide6.QtCore import QAbstractItemModel, QModelIndex, Qt, Signal, Slot, QMimeData, QByteArray, QDataStream, QIODevice, QPersistentModelIndex
|
||||
from PySide6.QtGui import QColor
|
||||
from pathlib import Path
|
||||
from rule_structure import SourceRule, AssetRule, FileRule
|
||||
from configuration import load_base_config
|
||||
from typing import List
|
||||
from configuration import Configuration # Import Configuration class
|
||||
|
||||
class CustomRoles:
|
||||
MapTypeRole = Qt.UserRole + 1
|
||||
@ -46,8 +46,9 @@ class UnifiedViewModel(QAbstractItemModel):
|
||||
# --- Drag and Drop MIME Type ---
|
||||
MIME_TYPE = "application/x-filerule-index-list"
|
||||
|
||||
def __init__(self, parent=None):
|
||||
def __init__(self, config: Configuration, parent=None):
|
||||
super().__init__(parent)
|
||||
self._config = config # Store the Configuration object
|
||||
self._source_rules = []
|
||||
# self._display_mode removed
|
||||
self._asset_type_colors = {}
|
||||
@ -59,9 +60,9 @@ class UnifiedViewModel(QAbstractItemModel):
|
||||
def _load_definitions(self):
|
||||
"""Loads configuration and caches colors and type keys."""
|
||||
try:
|
||||
base_config = load_base_config()
|
||||
asset_type_defs = base_config.get('ASSET_TYPE_DEFINITIONS', {})
|
||||
file_type_defs = base_config.get('FILE_TYPE_DEFINITIONS', {})
|
||||
# Access configuration directly from the stored object using public methods
|
||||
asset_type_defs = self._config.get_asset_type_definitions()
|
||||
file_type_defs = self._config.get_file_type_definitions_with_examples()
|
||||
|
||||
# Cache Asset Type Definitions (Keys and Colors)
|
||||
self._asset_type_keys = sorted(list(asset_type_defs.keys()))
|
||||
@ -905,37 +906,22 @@ class UnifiedViewModel(QAbstractItemModel):
|
||||
encoded_data = QByteArray()
|
||||
stream = QDataStream(encoded_data, QIODevice.OpenModeFlag.WriteOnly)
|
||||
|
||||
dragged_file_info = []
|
||||
# Store QPersistentModelIndex for robustness
|
||||
persistent_indices = []
|
||||
for index in indexes:
|
||||
if not index.isValid() or index.column() != 0:
|
||||
continue
|
||||
item = index.internalPointer()
|
||||
if isinstance(item, FileRule):
|
||||
parent_index = self.parent(index)
|
||||
if parent_index.isValid():
|
||||
# Store: source_row, source_parent_row, source_grandparent_row
|
||||
# This allows reconstructing the index later
|
||||
grandparent_index = self.parent(parent_index)
|
||||
# Ensure grandparent_index is valid before accessing its row
|
||||
if grandparent_index.isValid():
|
||||
dragged_file_info.append((index.row(), parent_index.row(), grandparent_index.row()))
|
||||
else:
|
||||
# Handle case where grandparent is the root (shouldn't happen for FileRule, but safety)
|
||||
# Or if parent() failed unexpectedly
|
||||
log.warning(f"mimeData: Could not get valid grandparent index for FileRule at row {index.row()}, parent row {parent_index.row()}")
|
||||
if index.isValid() and index.column() == 0:
|
||||
item = index.internalPointer()
|
||||
if isinstance(item, FileRule):
|
||||
persistent_indices.append(QPersistentModelIndex(index))
|
||||
log.debug(f"mimeData: Added persistent index for file: {Path(item.file_path).name}")
|
||||
|
||||
else:
|
||||
log.warning(f"mimeData: Could not get parent index for FileRule at row {index.row()}")
|
||||
|
||||
# Write the number of items first, then each tuple
|
||||
stream.writeInt8(len(dragged_file_info))
|
||||
for info in dragged_file_info:
|
||||
stream.writeInt8(info[0])
|
||||
stream.writeInt8(info[1])
|
||||
stream.writeInt8(info[2])
|
||||
# Write the number of items first, then each persistent index
|
||||
stream.writeInt32(len(persistent_indices)) # Use writeInt32 for potentially more items
|
||||
for p_index in persistent_indices:
|
||||
stream.writeQPersistentModelIndex(p_index)
|
||||
|
||||
mime_data.setData(self.MIME_TYPE, encoded_data)
|
||||
log.debug(f"mimeData: Encoded {len(dragged_file_info)} FileRule indices.")
|
||||
log.debug(f"mimeData: Encoded {len(persistent_indices)} FileRule persistent indices.")
|
||||
return mime_data
|
||||
|
||||
def canDropMimeData(self, data: QMimeData, action: Qt.DropAction, row: int, column: int, parent: QModelIndex) -> bool:
|
||||
@ -970,75 +956,48 @@ class UnifiedViewModel(QAbstractItemModel):
|
||||
encoded_data = data.data(self.MIME_TYPE)
|
||||
stream = QDataStream(encoded_data, QIODevice.OpenModeFlag.ReadOnly)
|
||||
|
||||
num_items = stream.readInt8()
|
||||
source_indices_info = []
|
||||
# Read QPersistentModelIndex objects
|
||||
persistent_indices = []
|
||||
num_items = stream.readInt32()
|
||||
log.debug(f"dropMimeData: Decoding {num_items} persistent indices.")
|
||||
for _ in range(num_items):
|
||||
source_row = stream.readInt8()
|
||||
source_parent_row = stream.readInt8()
|
||||
source_grandparent_row = stream.readInt8()
|
||||
source_indices_info.append((source_row, source_parent_row, source_grandparent_row))
|
||||
p_index = stream.readQPersistentModelIndex()
|
||||
if p_index.isValid():
|
||||
persistent_indices.append(p_index)
|
||||
else:
|
||||
log.warning("dropMimeData: Decoded invalid persistent index. Skipping.")
|
||||
|
||||
log.debug(f"dropMimeData: Decoded {len(source_indices_info)} source indices. Target Asset: '{target_asset_item.asset_name}'")
|
||||
log.debug(f"dropMimeData: Decoded {len(persistent_indices)} valid persistent indices. Target Asset: '{target_asset_item.asset_name}'")
|
||||
|
||||
if not source_indices_info:
|
||||
log.warning("dropMimeData: No valid source index information decoded.")
|
||||
if not persistent_indices:
|
||||
log.warning("dropMimeData: No valid persistent index information decoded.")
|
||||
return False
|
||||
|
||||
# Keep track of original parents that might become empty
|
||||
original_parents = set()
|
||||
original_parents_to_check = set()
|
||||
moved_files_new_indices = {}
|
||||
|
||||
# --- BEGIN FIX: Reconstruct all source indices BEFORE the move loop ---
|
||||
source_indices_to_process = []
|
||||
log.debug("Reconstructing initial source indices...")
|
||||
for src_row, src_parent_row, src_grandparent_row in source_indices_info:
|
||||
grandparent_index = self.index(src_grandparent_row, 0, QModelIndex())
|
||||
if not grandparent_index.isValid():
|
||||
log.error(f"dropMimeData: Failed initial reconstruction of grandparent index (row {src_grandparent_row}). Skipping item.")
|
||||
continue
|
||||
old_parent_index = self.index(src_parent_row, 0, grandparent_index)
|
||||
if not old_parent_index.isValid():
|
||||
log.error(f"dropMimeData: Failed initial reconstruction of old parent index (row {src_parent_row}). Skipping item.")
|
||||
continue
|
||||
source_file_index = self.index(src_row, 0, old_parent_index)
|
||||
# Process moves using the persistent indices
|
||||
for p_source_index in persistent_indices:
|
||||
# Convert persistent index back to a model index
|
||||
source_file_index = QModelIndex(p_source_index)
|
||||
|
||||
if not source_file_index.isValid():
|
||||
# Log the specific parent it failed under for better debugging
|
||||
parent_name = getattr(old_parent_index.internalPointer(), 'asset_name', 'Unknown Parent')
|
||||
log.error(f"dropMimeData: Failed initial reconstruction of source file index (original row {src_row}) under parent '{parent_name}'. Skipping item.")
|
||||
log.warning(f"dropMimeData: Persistent index is no longer valid. Skipping item.")
|
||||
continue
|
||||
|
||||
# Check if the reconstructed index actually points to a FileRule
|
||||
item_check = source_file_index.internalPointer()
|
||||
if isinstance(item_check, FileRule):
|
||||
source_indices_to_process.append(source_file_index)
|
||||
log.debug(f" Successfully reconstructed index for file: {Path(item_check.file_path).name}")
|
||||
else:
|
||||
log.warning(f"dropMimeData: Initial reconstructed index (row {src_row}) does not point to a FileRule. Skipping.")
|
||||
|
||||
log.debug(f"Successfully reconstructed {len(source_indices_to_process)} valid source indices.")
|
||||
# --- END FIX ---
|
||||
|
||||
|
||||
# Process moves using the pre-calculated valid indices
|
||||
for source_file_index in source_indices_to_process:
|
||||
# Get the file item (already validated during reconstruction)
|
||||
# Get the file item
|
||||
file_item = source_file_index.internalPointer()
|
||||
if not isinstance(file_item, FileRule):
|
||||
log.error(f"dropMimeData: Index points to non-FileRule item after conversion. Skipping.")
|
||||
continue
|
||||
|
||||
# Track original parent for cleanup (using the valid index)
|
||||
old_parent_index = self.parent(source_file_index)
|
||||
if old_parent_index.isValid():
|
||||
old_parent_asset = old_parent_index.internalPointer()
|
||||
if isinstance(old_parent_asset, AssetRule):
|
||||
# Need grandparent row for the tuple key
|
||||
grandparent_index = self.parent(old_parent_index)
|
||||
if grandparent_index.isValid():
|
||||
original_parents.add((grandparent_index.row(), old_parent_asset.asset_name))
|
||||
else:
|
||||
log.warning(f"Could not get grandparent index for original parent '{old_parent_asset.asset_name}' during cleanup tracking.")
|
||||
else:
|
||||
log.warning(f"Parent of file '{Path(file_item.file_path).name}' is not an AssetRule.")
|
||||
# Track original parent for cleanup using the parent back-reference
|
||||
old_parent_asset = getattr(file_item, 'parent_asset', None)
|
||||
if old_parent_asset and isinstance(old_parent_asset, AssetRule):
|
||||
original_parents_to_check.add(old_parent_asset)
|
||||
else:
|
||||
log.warning(f"Could not get valid parent index for file '{Path(file_item.file_path).name}' during cleanup tracking.")
|
||||
log.warning(f"dropMimeData: File '{Path(file_item.file_path).name}' has no valid parent asset reference for cleanup tracking.")
|
||||
|
||||
|
||||
# Perform the move using the model's method and the valid source_file_index
|
||||
@ -1052,8 +1011,9 @@ class UnifiedViewModel(QAbstractItemModel):
|
||||
file_item.target_asset_name_override = target_asset_item.asset_name
|
||||
# Need the *new* index of the moved file to emit dataChanged
|
||||
try:
|
||||
# Find the new row of the file item within the target parent's list
|
||||
new_row = target_asset_item.files.index(file_item)
|
||||
new_file_index_col0 = self.index(new_row, 0, parent)
|
||||
# Create the index for the target asset column
|
||||
new_file_index_target_col = self.index(new_row, self.COL_TARGET_ASSET, parent)
|
||||
if new_file_index_target_col.isValid():
|
||||
moved_files_new_indices[file_item.file_path] = new_file_index_target_col
|
||||
@ -1074,24 +1034,30 @@ class UnifiedViewModel(QAbstractItemModel):
|
||||
self.dataChanged.emit(new_index, new_index, [Qt.DisplayRole, Qt.EditRole])
|
||||
|
||||
# --- Cleanup: Remove any original parent AssetRules that are now empty ---
|
||||
log.debug(f"dropMimeData: Checking original parents for cleanup: {list(original_parents)}")
|
||||
for gp_row, asset_name in list(original_parents):
|
||||
log.debug(f"dropMimeData: Checking original parents for cleanup: {[asset.asset_name for asset in original_parents_to_check]}")
|
||||
# Convert set to list to iterate and allow removal from the model
|
||||
for asset_rule_to_check in list(original_parents_to_check):
|
||||
try:
|
||||
if 0 <= gp_row < len(self._source_rules):
|
||||
source_rule = self._source_rules[gp_row]
|
||||
# Find the asset rule within the correct source rule
|
||||
asset_rule_to_check = next((asset for asset in source_rule.assets if asset.asset_name == asset_name), None)
|
||||
|
||||
if asset_rule_to_check and not asset_rule_to_check.files and asset_rule_to_check != target_asset_item:
|
||||
log.info(f"dropMimeData: Attempting cleanup of now empty original parent: '{asset_rule_to_check.asset_name}'")
|
||||
if not self.removeAssetRule(asset_rule_to_check):
|
||||
log.warning(f"dropMimeData: Failed to remove empty original parent '{asset_rule_to_check.asset_name}'.")
|
||||
elif not asset_rule_to_check:
|
||||
log.warning(f"dropMimeData: Cleanup check failed. Could not find original parent asset '{asset_name}' in source rule at row {gp_row}.")
|
||||
# Re-check if the asset is still in the model and is now empty
|
||||
# Use parent back-reference to find the source rule
|
||||
source_rule = getattr(asset_rule_to_check, 'parent_source', None)
|
||||
if source_rule:
|
||||
# Check if the asset rule is still in its parent's list
|
||||
if asset_rule_to_check in source_rule.assets:
|
||||
if not asset_rule_to_check.files and asset_rule_to_check is not target_asset_item:
|
||||
log.info(f"dropMimeData: Attempting cleanup of now empty original parent: '{asset_rule_to_check.asset_name}'")
|
||||
if not self.removeAssetRule(asset_rule_to_check):
|
||||
log.warning(f"dropMimeData: Failed to remove empty original parent '{asset_rule_to_check.asset_name}'.")
|
||||
elif asset_rule_to_check.files:
|
||||
log.debug(f"dropMimeData: Original parent '{asset_rule_to_check.asset_name}' is not empty after moves. Skipping cleanup.")
|
||||
# If it's the target asset, we don't remove it
|
||||
else:
|
||||
log.warning(f"dropMimeData: Cleanup check failed. Original parent asset '{asset_rule_to_check.asset_name}' not found in its source rule's list.")
|
||||
else:
|
||||
log.warning(f"dropMimeData: Cleanup check failed. Invalid grandparent row index {gp_row} found in original_parents set.")
|
||||
log.warning(f"dropMimeData: Cleanup check failed. Original parent asset '{asset_rule_to_check.asset_name}' has no parent source reference.")
|
||||
|
||||
except Exception as e:
|
||||
log.exception(f"dropMimeData: Error during cleanup check for parent '{asset_name}' (gp_row {gp_row}): {e}")
|
||||
log.exception(f"dropMimeData: Error during cleanup check for parent '{asset_rule_to_check.asset_name}': {e}")
|
||||
|
||||
|
||||
return True
|
||||
208
main.py
208
main.py
@ -252,6 +252,7 @@ class ProcessingTask(QRunnable):
|
||||
else:
|
||||
log.debug(f"No incrementing token found in pattern '{pattern}'. Skipping increment calculation.")
|
||||
next_increment_str = None # Or a default like "00" if downstream expects a string, but None is cleaner if handled.
|
||||
log.debug(f"Calculated next incrementing value for {output_dir}: {next_increment_str}")
|
||||
else:
|
||||
log.warning(f"Cannot calculate incrementing value: 'output_directory_pattern' not found in configuration for preset {config.preset_name}")
|
||||
except Exception as e:
|
||||
@ -308,51 +309,58 @@ class App(QObject):
|
||||
def __init__(self, user_config_path: str):
|
||||
super().__init__()
|
||||
self.user_config_path = user_config_path # Store the determined user config path
|
||||
self.config_obj = None
|
||||
self.processing_engine = None
|
||||
self.config_obj = None # Initialize config_obj to None
|
||||
self.processing_engine = None # Initialize processing_engine to None
|
||||
self.main_window = None
|
||||
self.thread_pool = QThreadPool()
|
||||
self._active_tasks_count = 0
|
||||
self._task_results = {"processed": 0, "skipped": 0, "failed": 0}
|
||||
log.info(f"Maximum threads for pool: {self.thread_pool.maxThreadCount()}")
|
||||
|
||||
self._load_config(self.user_config_path) # Pass the user config path
|
||||
self._init_engine()
|
||||
self._init_gui()
|
||||
# Configuration, engine, and GUI are now initialized via load_preset
|
||||
log.debug("App initialized. Configuration, engine, and GUI will be loaded via load_preset.")
|
||||
|
||||
def _load_config(self, user_config_path: str):
|
||||
"""Loads the base configuration using the determined user config path."""
|
||||
def _load_config(self, user_config_path: str, preset_name: str):
|
||||
"""
|
||||
Loads the configuration using the determined user config path and specified preset.
|
||||
Sets self.config_obj. Does NOT exit on failure; raises ConfigurationError.
|
||||
"""
|
||||
log.debug(f"App: Attempting to load configuration with user_config_path='{user_config_path}' and preset_name='{preset_name}'")
|
||||
try:
|
||||
# Initialize Configuration with the determined user config path
|
||||
# The Configuration class is responsible for finding presets and other configs
|
||||
self.config_obj = Configuration(base_dir_user_config=user_config_path)
|
||||
log.info(f"Base configuration loaded using user config path: '{user_config_path}'.")
|
||||
# Convert user_config_path string to a Path object before passing to Configuration
|
||||
user_config_path_obj = Path(user_config_path)
|
||||
# Instantiate Configuration with the determined user config path and the specified preset name
|
||||
self.config_obj = Configuration(preset_name=preset_name, base_dir_user_config=user_config_path_obj)
|
||||
log.info(f"App: Configuration loaded successfully with preset '{preset_name}'.")
|
||||
except ConfigurationError as e:
|
||||
log.error(f"Fatal: Failed to load base configuration using user config path '{user_config_path}': {e}")
|
||||
# In a real app, show this error to the user before exiting
|
||||
sys.exit(1)
|
||||
log.error(f"App: Failed to load configuration with preset '{preset_name}': {e}")
|
||||
self.config_obj = None # Ensure config_obj is None on failure
|
||||
raise # Re-raise the exception
|
||||
except Exception as e:
|
||||
log.exception(f"Fatal: Unexpected error loading configuration: {e}")
|
||||
sys.exit(1)
|
||||
log.exception(f"App: Unexpected error loading configuration with preset '{preset_name}': {e}")
|
||||
self.config_obj = None # Ensure config_obj is None on failure
|
||||
raise # Re-raise unexpected errors
|
||||
|
||||
def _init_engine(self):
|
||||
"""Initializes the ProcessingEngine."""
|
||||
"""Initializes the ProcessingEngine if config_obj is available."""
|
||||
if self.config_obj:
|
||||
try:
|
||||
self.processing_engine = ProcessingEngine(self.config_obj)
|
||||
log.info("ProcessingEngine initialized.")
|
||||
log.info("App: ProcessingEngine initialized.")
|
||||
except Exception as e:
|
||||
log.exception(f"Fatal: Failed to initialize ProcessingEngine: {e}")
|
||||
# Show error and exit
|
||||
sys.exit(1)
|
||||
log.exception(f"App: Failed to initialize ProcessingEngine: {e}")
|
||||
self.processing_engine = None # Ensure engine is None on failure
|
||||
# Depending on context, this might need to be a fatal error.
|
||||
# For now, log and set to None.
|
||||
else:
|
||||
log.error("Fatal: Cannot initialize ProcessingEngine without configuration.")
|
||||
sys.exit(1)
|
||||
log.warning("App: Cannot initialize ProcessingEngine: config_obj is None.")
|
||||
self.processing_engine = None
|
||||
|
||||
def _init_gui(self):
|
||||
"""Initializes the MainWindow and connects signals."""
|
||||
if self.processing_engine:
|
||||
self.main_window = MainWindow() # MainWindow now part of the App
|
||||
"""Initializes the MainWindow and connects signals if processing_engine is available."""
|
||||
if self.processing_engine and self.config_obj:
|
||||
# Pass the config object to MainWindow during initialization
|
||||
self.main_window = MainWindow(config=self.config_obj)
|
||||
# Connect the signal from the GUI to the App's slot using QueuedConnection
|
||||
# Connect the signal from the MainWindow (which is triggered by the panel) to the App's slot
|
||||
connection_success = self.main_window.start_backend_processing.connect(self.on_processing_requested, Qt.ConnectionType.QueuedConnection)
|
||||
@ -363,10 +371,53 @@ class App(QObject):
|
||||
log.error("*********************************************************")
|
||||
# Connect the App's completion signal to the MainWindow's slot
|
||||
self.all_tasks_finished.connect(self.main_window.on_processing_finished)
|
||||
log.info("MainWindow initialized and signals connected.")
|
||||
log.info("App: MainWindow initialized and signals connected.")
|
||||
else:
|
||||
log.error("Fatal: Cannot initialize MainWindow without ProcessingEngine.")
|
||||
sys.exit(1)
|
||||
log.warning("App: Cannot initialize MainWindow: ProcessingEngine or config_obj is None.")
|
||||
self.main_window = None # Ensure main_window is None if initialization fails
|
||||
|
||||
def load_preset(self, preset_name: str):
|
||||
"""
|
||||
Loads the specified preset and re-initializes the configuration and processing engine.
|
||||
This is intended to be called after App initialization, e.g., by the GUI or autotest.
|
||||
"""
|
||||
log.info(f"App: Loading preset '{preset_name}'...")
|
||||
try:
|
||||
# Load the configuration with the specified preset
|
||||
self._load_config(self.user_config_path, preset_name)
|
||||
log.info(f"App: Configuration reloaded with preset '{preset_name}'.")
|
||||
|
||||
# Re-initialize the ProcessingEngine with the new configuration
|
||||
self._init_engine()
|
||||
log.info("App: ProcessingEngine re-initialized with new configuration.")
|
||||
|
||||
# Initialize GUI if it hasn't been already (e.g., in Autotest where it's needed after config)
|
||||
if not self.main_window:
|
||||
self._init_gui()
|
||||
if self.main_window:
|
||||
log.debug("App: MainWindow initialized after preset load.")
|
||||
else:
|
||||
log.error("App: Failed to initialize MainWindow after preset load.")
|
||||
else:
|
||||
# If GUI was already initialized (e.g., in GUI mode),
|
||||
# inform it about the config change if needed
|
||||
# (e.g., to update delegates or other config-dependent UI elements)
|
||||
# The MainWindow and its components (like UnifiedViewModel, MainPanelWidget)
|
||||
# already hold a reference to the config_obj.
|
||||
# If they need to react to a *change* in config_obj, they would need
|
||||
# a signal or a method call here.
|
||||
# For now, assume they access the updated self.config_obj directly when needed.
|
||||
log.debug("App: MainWindow already exists, assuming it will use the updated config_obj.")
|
||||
|
||||
|
||||
except ConfigurationError as e:
|
||||
log.error(f"App: Failed to load preset '{preset_name}': {e}")
|
||||
# Depending on context (GUI vs CLI/Autotest), this might need to be handled differently.
|
||||
# For Autotest, this is likely a fatal error. For GUI, show a message box.
|
||||
raise # Re-raise the exception to be caught by the caller (e.g., Autotest)
|
||||
except Exception as e:
|
||||
log.exception(f"App: Unexpected error loading preset '{preset_name}': {e}")
|
||||
raise # Re-raise unexpected errors
|
||||
|
||||
@Slot(list, dict) # Slot to receive List[SourceRule] and processing_settings dict
|
||||
def on_processing_requested(self, source_rules: list, processing_settings: dict):
|
||||
@ -377,28 +428,98 @@ class App(QObject):
|
||||
log.info(f"VERIFY: App.on_processing_requested received {len(source_rules)} rules.")
|
||||
for i, rule in enumerate(source_rules):
|
||||
log.debug(f" VERIFY Rule {i}: Input='{rule.input_path}', Assets={len(rule.assets)}")
|
||||
|
||||
if not self.processing_engine:
|
||||
log.error("Processing engine not available. Cannot process request.")
|
||||
self.main_window.statusBar().showMessage("Error: Processing Engine not ready.", 5000)
|
||||
if self.main_window:
|
||||
self.main_window.statusBar().showMessage("Error: Processing Engine not ready.", 5000)
|
||||
# Emit finished signal with failure counts if engine is not ready
|
||||
self.all_tasks_finished.emit(0, 0, len(source_rules))
|
||||
return
|
||||
|
||||
if not source_rules:
|
||||
log.warning("Processing requested with an empty rule list.")
|
||||
self.main_window.statusBar().showMessage("No rules to process.", 3000)
|
||||
if self.main_window:
|
||||
self.main_window.statusBar().showMessage("No rules to process.", 3000)
|
||||
# Emit finished signal immediately if no rules
|
||||
self.all_tasks_finished.emit(0, 0, 0)
|
||||
return
|
||||
|
||||
# Reset task counter and results for this batch
|
||||
self._active_tasks_count = len(source_rules)
|
||||
self._task_results = {"processed": 0, "skipped": 0, "failed": 0}
|
||||
log.debug(f"Initialized active task count to: {self._active_tasks_count}")
|
||||
log.info(f"Initialized active task count to: {self._active_tasks_count}")
|
||||
|
||||
# Update GUI progress bar/status via MainPanelWidget
|
||||
total_tasks = self.main_window.main_panel_widget.progress_bar.maximum()
|
||||
completed_tasks = total_tasks - self._active_tasks_count
|
||||
self.main_window.main_panel_widget.update_progress_bar(completed_tasks, total_tasks) # Use MainPanelWidget's method
|
||||
if self.main_window and hasattr(self.main_window, 'main_panel_widget') and self.main_window.main_panel_widget:
|
||||
# Set maximum value of progress bar to total number of tasks
|
||||
self.main_window.main_panel_widget.progress_bar.setMaximum(self._active_tasks_count)
|
||||
self.main_window.main_panel_widget.update_progress_bar(0, self._active_tasks_count) # Start at 0
|
||||
else:
|
||||
log.warning("App: Cannot update progress bar, main_window or main_panel_widget not available.")
|
||||
|
||||
# Update status for the specific file in the GUI (if needed)
|
||||
# Extract processing settings
|
||||
output_dir = Path(processing_settings.get("output_dir"))
|
||||
overwrite = processing_settings.get("overwrite", False)
|
||||
# Workers setting is used by QThreadPool itself, not passed to individual tasks
|
||||
# blender_enabled, nodegroup_blend_path, materials_blend_path are not used by the engine directly,
|
||||
# they would be handled by a post-processing stage if implemented.
|
||||
|
||||
if self._active_tasks_count == 0:
|
||||
# Submit tasks to the thread pool
|
||||
log.info(f"Submitting {len(source_rules)} processing tasks to the thread pool.")
|
||||
for rule in source_rules:
|
||||
# Create a ProcessingTask for each SourceRule
|
||||
# workspace_path, incrementing_value, and sha5_value are calculated within ProcessingTask.run
|
||||
task = ProcessingTask(
|
||||
engine=self.processing_engine,
|
||||
rule=rule,
|
||||
workspace_path=Path(rule.input_path), # Pass the original input path for workspace preparation
|
||||
output_base_path=output_dir
|
||||
)
|
||||
# Connect the task's finished signal to the App's slot
|
||||
task.signals.finished.connect(self._on_task_finished)
|
||||
# Start the task in the thread pool
|
||||
self.thread_pool.start(task)
|
||||
log.debug(f"Submitted task for rule: {rule.input_path}")
|
||||
|
||||
log.info("All processing tasks submitted to thread pool.")
|
||||
|
||||
@Slot(str, str, object) # rule_input_path, status, result/error
|
||||
def _on_task_finished(self, rule_input_path: str, status: str, result_or_error: object):
|
||||
"""Slot to handle the completion of an individual processing task."""
|
||||
log.debug(f"DEBUG: App._on_task_finished slot entered for rule: {rule_input_path} with status: {status}")
|
||||
|
||||
# Decrement the active task count
|
||||
self._active_tasks_count -= 1
|
||||
|
||||
# Update task results based on status
|
||||
if status == "processed":
|
||||
self._task_results["processed"] += 1
|
||||
elif status == "skipped":
|
||||
self._task_results["skipped"] += 1
|
||||
elif status.startswith("failed"): # Catches "failed_preparation" and "failed_processing"
|
||||
self._task_results["failed"] += 1
|
||||
log.error(f"Task failed for {rule_input_path}: {result_or_error}")
|
||||
else:
|
||||
log.warning(f"Task finished with unknown status '{status}' for {rule_input_path}. Treating as failed.")
|
||||
self._task_results["failed"] += 1
|
||||
log.error(f"Task with unknown status failed for {rule_input_path}: {result_or_error}")
|
||||
|
||||
log.info(f"Task finished for {rule_input_path}. Status: {status}. Remaining tasks: {self._active_tasks_count}")
|
||||
log.debug(f"Current task results: Processed={self._task_results['processed']}, Skipped={self._task_results['skipped']}, Failed={self._task_results['failed']}")
|
||||
|
||||
# Update GUI progress bar
|
||||
if self.main_window and hasattr(self.main_window, 'main_panel_widget') and self.main_window.main_panel_widget:
|
||||
completed_tasks = self._task_results["processed"] + self._task_results["skipped"] + self._task_results["failed"]
|
||||
self.main_window.main_panel_widget.update_progress_bar(completed_tasks, self._task_results["processed"] + self._task_results["skipped"] + self._task_results["failed"] + self._active_tasks_count) # Update with current counts
|
||||
# Update status text if needed (e.g., "Processing X of Y...")
|
||||
self.main_window.main_panel_widget.set_progress_bar_text(f"Processing: {completed_tasks}/{self._task_results['processed'] + self._task_results['skipped'] + self._task_results['failed'] + self._active_tasks_count}")
|
||||
else:
|
||||
log.warning("App: Cannot update progress bar in _on_task_finished, main_window or main_panel_widget not available.")
|
||||
|
||||
|
||||
# Check if all tasks are finished
|
||||
if self._active_tasks_count <= 0: # Use <= 0 to handle potential errors leading to negative count
|
||||
log.info("All processing tasks finished.")
|
||||
# Emit the signal with the final counts
|
||||
self.all_tasks_finished.emit(
|
||||
@ -406,6 +527,9 @@ class App(QObject):
|
||||
self._task_results["skipped"],
|
||||
self._task_results["failed"]
|
||||
)
|
||||
# Reset task count to 0 explicitly
|
||||
self._active_tasks_count = 0
|
||||
log.debug("Emitted all_tasks_finished signal.")
|
||||
elif self._active_tasks_count < 0:
|
||||
log.error("Error: Active task count went below zero!") # Should not happen
|
||||
|
||||
@ -417,6 +541,14 @@ class App(QObject):
|
||||
else:
|
||||
log.error("Cannot run application, MainWindow not initialized.")
|
||||
|
||||
def run(self):
|
||||
"""Shows the main window."""
|
||||
if self.main_window:
|
||||
self.main_window.show()
|
||||
log.info("Application started. Showing main window.")
|
||||
else:
|
||||
log.error("Cannot run application, MainWindow not initialized.")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
parser = setup_arg_parser()
|
||||
@ -485,6 +617,8 @@ if __name__ == "__main__":
|
||||
|
||||
|
||||
app_instance = App(user_config_path) # Pass the determined path
|
||||
# Load an initial preset after App initialization to set up config, engine, and GUI
|
||||
app_instance.load_preset("_template")
|
||||
app_instance.run()
|
||||
|
||||
sys.exit(qt_app.exec())
|
||||
|
||||
@ -97,6 +97,7 @@ class OutputOrganizationStage(ProcessingStage):
|
||||
token_data_variant = {
|
||||
"assetname": asset_name_for_log,
|
||||
"supplier": context.effective_supplier or "DefaultSupplier",
|
||||
"asset_category": context.asset_rule.asset_category, # Added asset_category
|
||||
"maptype": base_map_type,
|
||||
"resolution": variant_resolution_key,
|
||||
"ext": variant_ext,
|
||||
@ -162,13 +163,14 @@ class OutputOrganizationStage(ProcessingStage):
|
||||
resolution_str = details.get('processed_resolution_name', details.get('original_resolution_name', 'resX'))
|
||||
|
||||
token_data = {
|
||||
"assetname": asset_name_for_log,
|
||||
"supplier": context.effective_supplier or "DefaultSupplier",
|
||||
"maptype": base_map_type,
|
||||
"resolution": resolution_str,
|
||||
"ext": temp_file_path.suffix.lstrip('.'),
|
||||
"incrementingvalue": getattr(context, 'incrementing_value', None),
|
||||
"sha5": getattr(context, 'sha5_value', None)
|
||||
"assetname": asset_name_for_log,
|
||||
"supplier": context.effective_supplier or "DefaultSupplier",
|
||||
"asset_category": context.asset_rule.asset_category, # Added asset_category
|
||||
"maptype": base_map_type,
|
||||
"resolution": resolution_str,
|
||||
"ext": temp_file_path.suffix.lstrip('.'),
|
||||
"incrementingvalue": getattr(context, 'incrementing_value', None),
|
||||
"sha5": getattr(context, 'sha5_value', None)
|
||||
}
|
||||
token_data_cleaned = {k: v for k, v in token_data.items() if v is not None}
|
||||
|
||||
@ -176,8 +178,8 @@ class OutputOrganizationStage(ProcessingStage):
|
||||
|
||||
try:
|
||||
relative_dir_path_str = generate_path_from_pattern(
|
||||
pattern_string=output_dir_pattern,
|
||||
token_data=token_data_cleaned
|
||||
pattern_string=output_dir_pattern,
|
||||
token_data=token_data_cleaned
|
||||
)
|
||||
logger.debug(f"OUTPUT_ORG_DEBUG: SingleFile - Using context.output_base_path = {context.output_base_path} for final_path construction.") # Added
|
||||
final_path = Path(context.output_base_path) / Path(relative_dir_path_str) / Path(output_filename)
|
||||
@ -214,9 +216,8 @@ class OutputOrganizationStage(ProcessingStage):
|
||||
details['status'] = 'Organization Failed'
|
||||
|
||||
# --- Handle other statuses (Skipped, Failed, etc.) ---
|
||||
else: # Catches statuses not explicitly handled above
|
||||
logger.debug(f"Asset '{asset_name_for_log}': Skipping map key '{processed_map_key}' (status: '{map_status}') for organization as it's not a recognized final processed state or variant state.")
|
||||
continue
|
||||
else: # Catches statuses not explicitly handled above
|
||||
logger.debug(f"Asset '{asset_name_for_log}': Skipping map key '{processed_map_key}' (status: '{map_status}') for organization as it's not a recognized final processed state or variant state.")
|
||||
else:
|
||||
logger.debug(f"Asset '{asset_name_for_log}': No processed individual maps to organize.")
|
||||
|
||||
@ -243,18 +244,19 @@ class OutputOrganizationStage(ProcessingStage):
|
||||
# However, generate_path_from_pattern might expect them or handle their absence.
|
||||
# For the base asset directory, only assetname and supplier are typically primary.
|
||||
base_token_data = {
|
||||
"assetname": asset_name_for_log,
|
||||
"supplier": context.effective_supplier or "DefaultSupplier",
|
||||
# Add other tokens if your output_directory_pattern uses them at the asset level
|
||||
"incrementingvalue": getattr(context, 'incrementing_value', None),
|
||||
"sha5": getattr(context, 'sha5_value', None)
|
||||
"assetname": asset_name_for_log,
|
||||
"supplier": context.effective_supplier or "DefaultSupplier",
|
||||
"asset_category": context.asset_rule.asset_category, # Added asset_category
|
||||
# Add other tokens if your output_directory_pattern uses them at the asset level
|
||||
"incrementingvalue": getattr(context, 'incrementing_value', None),
|
||||
"sha5": getattr(context, 'sha5_value', None)
|
||||
}
|
||||
base_token_data_cleaned = {k: v for k, v in base_token_data.items() if v is not None}
|
||||
|
||||
try:
|
||||
asset_base_output_dir_str = generate_path_from_pattern(
|
||||
pattern_string=output_dir_pattern, # Uses the same pattern as other maps for base dir
|
||||
token_data=base_token_data_cleaned
|
||||
pattern_string=output_dir_pattern, # Uses the same pattern as other maps for base dir
|
||||
token_data=base_token_data_cleaned
|
||||
)
|
||||
# Destination: <output_base_path>/<asset_base_output_dir_str>/<extra_subdir_name>/<original_filename>
|
||||
logger.debug(f"OUTPUT_ORG_DEBUG: ExtraFiles - Using context.output_base_path = {context.output_base_path} for final_dest_path construction.") # Added
|
||||
|
||||
@ -12,12 +12,14 @@ class FileRule:
|
||||
channel_merge_instructions: Dict[str, Any] = dataclasses.field(default_factory=dict)
|
||||
output_format_override: str = None
|
||||
processing_items: List['ProcessingItem'] = dataclasses.field(default_factory=list) # Added field
|
||||
parent_asset: 'AssetRule' = None # Added parent back-reference
|
||||
|
||||
def to_json(self) -> str:
|
||||
# Need to handle ProcessingItem serialization if it contains non-serializable types like np.ndarray
|
||||
# For now, assume asdict handles it or it's handled before calling to_json for persistence.
|
||||
# A custom asdict_factory might be needed for robust serialization.
|
||||
return json.dumps(dataclasses.asdict(self), indent=4)
|
||||
# Exclude parent_asset to avoid circular references
|
||||
data = dataclasses.asdict(self)
|
||||
if 'parent_asset' in data:
|
||||
del data['parent_asset']
|
||||
return json.dumps(data, indent=4)
|
||||
|
||||
@classmethod
|
||||
def from_json(cls, json_string: str) -> 'FileRule':
|
||||
@ -31,9 +33,14 @@ class AssetRule:
|
||||
asset_type_override: str = None
|
||||
common_metadata: Dict[str, Any] = dataclasses.field(default_factory=dict)
|
||||
files: List[FileRule] = dataclasses.field(default_factory=list)
|
||||
parent_source: 'SourceRule' = None # Added parent back-reference
|
||||
|
||||
def to_json(self) -> str:
|
||||
return json.dumps(dataclasses.asdict(self), indent=4)
|
||||
# Exclude parent_source to avoid circular references
|
||||
data = dataclasses.asdict(self)
|
||||
if 'parent_source' in data:
|
||||
del data['parent_source']
|
||||
return json.dumps(data, indent=4)
|
||||
|
||||
@classmethod
|
||||
def from_json(cls, json_string: str) -> 'AssetRule':
|
||||
|
||||
1
user_data/.first_run_complete
Normal file
1
user_data/.first_run_complete
Normal file
@ -0,0 +1 @@
|
||||
Asset Processor first-time setup complete.
|
||||
280
user_data/Presets/Dinesen.json
Normal file
280
user_data/Presets/Dinesen.json
Normal file
@ -0,0 +1,280 @@
|
||||
{
|
||||
"preset_name": "Dinesen",
|
||||
"supplier_name": "Dinesen",
|
||||
"notes": "Preset for standard Poliigon downloads. Prioritizes _xxx16 files. Moves previews etc. to Extra/. Assumes Metal/Rough workflow.",
|
||||
"source_naming": {
|
||||
"separator": "_",
|
||||
"part_indices": {
|
||||
"base_name": 0,
|
||||
"map_type": 1
|
||||
},
|
||||
"glossiness_keywords": [
|
||||
"GLOSS"
|
||||
]
|
||||
},
|
||||
"move_to_extra_patterns": [
|
||||
"*_Preview*",
|
||||
"*_Sphere*",
|
||||
"*_Cube*",
|
||||
"*_Flat*",
|
||||
"*.txt",
|
||||
"*.pdf",
|
||||
"*.url",
|
||||
"*.htm*",
|
||||
"*_Fabric.*",
|
||||
"*_DISP_*METALNESS*"
|
||||
],
|
||||
"map_type_mapping": [
|
||||
{
|
||||
"target_type": "MAP_COL",
|
||||
"keywords": [
|
||||
"COLOR*",
|
||||
"COL",
|
||||
"COL-*",
|
||||
"DIFFUSE",
|
||||
"DIF",
|
||||
"ALBEDO"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_NRM",
|
||||
"keywords": [
|
||||
"NORMAL*",
|
||||
"NORM*",
|
||||
"NRM*",
|
||||
"N"
|
||||
],
|
||||
"priority_keywords": [
|
||||
"*_NRM16*",
|
||||
"*_NM16*",
|
||||
"*Normal16*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_ROUGH",
|
||||
"keywords": [
|
||||
"ROUGHNESS",
|
||||
"ROUGH"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_GLOSS",
|
||||
"keywords": [
|
||||
"GLOSS"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_AO",
|
||||
"keywords": [
|
||||
"AMBIENTOCCLUSION",
|
||||
"AO"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_DISP",
|
||||
"keywords": [
|
||||
"DISPLACEMENT",
|
||||
"DISP",
|
||||
"HEIGHT",
|
||||
"BUMP"
|
||||
],
|
||||
"priority_keywords": [
|
||||
"*_DISP16*",
|
||||
"*_DSP16*",
|
||||
"*DSP16*",
|
||||
"*DISP16*",
|
||||
"*Displacement16*",
|
||||
"*Height16*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_REFL",
|
||||
"keywords": [
|
||||
"REFLECTION",
|
||||
"REFL",
|
||||
"SPECULAR",
|
||||
"SPEC"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_SSS",
|
||||
"keywords": [
|
||||
"SSS",
|
||||
"SUBSURFACE*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_FUZZ",
|
||||
"keywords": [
|
||||
"FUZZ"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_IDMAP",
|
||||
"keywords": [
|
||||
"IDMAP"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_MASK",
|
||||
"keywords": [
|
||||
"OPAC*",
|
||||
"TRANSP*",
|
||||
"MASK*",
|
||||
"ALPHA*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_METAL",
|
||||
"keywords": [
|
||||
"METAL*",
|
||||
"METALLIC"
|
||||
]
|
||||
}
|
||||
],
|
||||
"asset_category_rules": {
|
||||
"model_patterns": [
|
||||
"*.fbx",
|
||||
"*.obj",
|
||||
"*.blend",
|
||||
"*.mtl"
|
||||
],
|
||||
"decal_keywords": [
|
||||
"Decal"
|
||||
]
|
||||
},
|
||||
"archetype_rules": [
|
||||
[
|
||||
"Foliage",
|
||||
{
|
||||
"match_any": [
|
||||
"Plant",
|
||||
"Leaf",
|
||||
"Leaves",
|
||||
"Grass"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
],
|
||||
[
|
||||
"Fabric",
|
||||
{
|
||||
"match_any": [
|
||||
"Fabric",
|
||||
"Carpet",
|
||||
"Cloth",
|
||||
"Textile",
|
||||
"Leather"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
],
|
||||
[
|
||||
"Wood",
|
||||
{
|
||||
"match_any": [
|
||||
"Wood",
|
||||
"Timber",
|
||||
"Plank",
|
||||
"Board"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
],
|
||||
[
|
||||
"Metal",
|
||||
{
|
||||
"match_any": [
|
||||
"_Metal",
|
||||
"Steel",
|
||||
"Iron",
|
||||
"Gold",
|
||||
"Copper",
|
||||
"Chrome",
|
||||
"Aluminum",
|
||||
"Brass",
|
||||
"Bronze"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
],
|
||||
[
|
||||
"Concrete",
|
||||
{
|
||||
"match_any": [
|
||||
"Concrete",
|
||||
"Cement"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
],
|
||||
[
|
||||
"Ground",
|
||||
{
|
||||
"match_any": [
|
||||
"Ground",
|
||||
"Dirt",
|
||||
"Soil",
|
||||
"Mud",
|
||||
"Sand",
|
||||
"Gravel",
|
||||
"Asphalt",
|
||||
"Road",
|
||||
"Moss"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
],
|
||||
[
|
||||
"Stone",
|
||||
{
|
||||
"match_any": [
|
||||
"Stone",
|
||||
"Rock*",
|
||||
"Marble",
|
||||
"Granite",
|
||||
"Brick",
|
||||
"Tile",
|
||||
"Paving",
|
||||
"Pebble*",
|
||||
"Terrazzo",
|
||||
"Slate"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
],
|
||||
[
|
||||
"Plaster",
|
||||
{
|
||||
"match_any": [
|
||||
"Plaster",
|
||||
"Stucco",
|
||||
"Wall",
|
||||
"Paint"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
],
|
||||
[
|
||||
"Plastic",
|
||||
{
|
||||
"match_any": [
|
||||
"Plastic",
|
||||
"PVC",
|
||||
"Resin",
|
||||
"Rubber"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
],
|
||||
[
|
||||
"Glass",
|
||||
{
|
||||
"match_any": [
|
||||
"Glass"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
]
|
||||
]
|
||||
}
|
||||
280
user_data/Presets/Poliigon.json
Normal file
280
user_data/Presets/Poliigon.json
Normal file
@ -0,0 +1,280 @@
|
||||
{
|
||||
"preset_name": "Poliigon Standard v2",
|
||||
"supplier_name": "Poliigon",
|
||||
"notes": "Preset for standard Poliigon downloads. Prioritizes _xxx16 files. Moves previews etc. to Extra/. Assumes Metal/Rough workflow.",
|
||||
"source_naming": {
|
||||
"separator": "_",
|
||||
"part_indices": {
|
||||
"base_name": 0,
|
||||
"map_type": 1
|
||||
},
|
||||
"glossiness_keywords": [
|
||||
"GLOSS"
|
||||
]
|
||||
},
|
||||
"move_to_extra_patterns": [
|
||||
"*_Preview*",
|
||||
"*_Sphere*",
|
||||
"*_Cube*",
|
||||
"*_Flat*",
|
||||
"*.txt",
|
||||
"*.pdf",
|
||||
"*.url",
|
||||
"*.htm*",
|
||||
"*_Fabric.*",
|
||||
"*_Albedo*"
|
||||
],
|
||||
"map_type_mapping": [
|
||||
{
|
||||
"target_type": "MAP_COL",
|
||||
"keywords": [
|
||||
"COLOR*",
|
||||
"COL",
|
||||
"COL-*",
|
||||
"DIFFUSE",
|
||||
"DIF",
|
||||
"ALBEDO"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_NRM",
|
||||
"keywords": [
|
||||
"NORMAL*",
|
||||
"NORM*",
|
||||
"NRM*",
|
||||
"N"
|
||||
],
|
||||
"priority_keywords": [
|
||||
"*_NRM16*",
|
||||
"*_NM16*",
|
||||
"*Normal16*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_ROUGH",
|
||||
"keywords": [
|
||||
"ROUGHNESS",
|
||||
"ROUGH"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_GLOSS",
|
||||
"keywords": [
|
||||
"GLOSS"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_AO",
|
||||
"keywords": [
|
||||
"AMBIENTOCCLUSION",
|
||||
"AO"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_DISP",
|
||||
"keywords": [
|
||||
"DISPLACEMENT",
|
||||
"DISP",
|
||||
"HEIGHT",
|
||||
"BUMP"
|
||||
],
|
||||
"priority_keywords": [
|
||||
"*_DISP16*",
|
||||
"*_DSP16*",
|
||||
"*DSP16*",
|
||||
"*DISP16*",
|
||||
"*Displacement16*",
|
||||
"*Height16*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_REFL",
|
||||
"keywords": [
|
||||
"REFLECTION",
|
||||
"REFL",
|
||||
"SPECULAR",
|
||||
"SPEC"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_SSS",
|
||||
"keywords": [
|
||||
"SSS",
|
||||
"SUBSURFACE*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_FUZZ",
|
||||
"keywords": [
|
||||
"FUZZ"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_IDMAP",
|
||||
"keywords": [
|
||||
"IDMAP"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_MASK",
|
||||
"keywords": [
|
||||
"OPAC*",
|
||||
"TRANSP*",
|
||||
"MASK*",
|
||||
"ALPHA*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_METAL",
|
||||
"keywords": [
|
||||
"METAL*",
|
||||
"METALLIC"
|
||||
]
|
||||
}
|
||||
],
|
||||
"asset_category_rules": {
|
||||
"model_patterns": [
|
||||
"*.fbx",
|
||||
"*.obj",
|
||||
"*.blend",
|
||||
"*.mtl"
|
||||
],
|
||||
"decal_keywords": [
|
||||
"Decal"
|
||||
]
|
||||
},
|
||||
"archetype_rules": [
|
||||
[
|
||||
"Foliage",
|
||||
{
|
||||
"match_any": [
|
||||
"Plant",
|
||||
"Leaf",
|
||||
"Leaves",
|
||||
"Grass"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
],
|
||||
[
|
||||
"Fabric",
|
||||
{
|
||||
"match_any": [
|
||||
"Fabric",
|
||||
"Carpet",
|
||||
"Cloth",
|
||||
"Textile",
|
||||
"Leather"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
],
|
||||
[
|
||||
"Wood",
|
||||
{
|
||||
"match_any": [
|
||||
"Wood",
|
||||
"Timber",
|
||||
"Plank",
|
||||
"Board"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
],
|
||||
[
|
||||
"Metal",
|
||||
{
|
||||
"match_any": [
|
||||
"_Metal",
|
||||
"Steel",
|
||||
"Iron",
|
||||
"Gold",
|
||||
"Copper",
|
||||
"Chrome",
|
||||
"Aluminum",
|
||||
"Brass",
|
||||
"Bronze"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
],
|
||||
[
|
||||
"Concrete",
|
||||
{
|
||||
"match_any": [
|
||||
"Concrete",
|
||||
"Cement"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
],
|
||||
[
|
||||
"Ground",
|
||||
{
|
||||
"match_any": [
|
||||
"Ground",
|
||||
"Dirt",
|
||||
"Soil",
|
||||
"Mud",
|
||||
"Sand",
|
||||
"Gravel",
|
||||
"Asphalt",
|
||||
"Road",
|
||||
"Moss"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
],
|
||||
[
|
||||
"Stone",
|
||||
{
|
||||
"match_any": [
|
||||
"Stone",
|
||||
"Rock*",
|
||||
"Marble",
|
||||
"Granite",
|
||||
"Brick",
|
||||
"Tile",
|
||||
"Paving",
|
||||
"Pebble*",
|
||||
"Terrazzo",
|
||||
"Slate"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
],
|
||||
[
|
||||
"Plaster",
|
||||
{
|
||||
"match_any": [
|
||||
"Plaster",
|
||||
"Stucco",
|
||||
"Wall",
|
||||
"Paint"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
],
|
||||
[
|
||||
"Plastic",
|
||||
{
|
||||
"match_any": [
|
||||
"Plastic",
|
||||
"PVC",
|
||||
"Resin",
|
||||
"Rubber"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
],
|
||||
[
|
||||
"Glass",
|
||||
{
|
||||
"match_any": [
|
||||
"Glass"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
]
|
||||
]
|
||||
}
|
||||
270
user_data/Presets/_template.json
Normal file
270
user_data/Presets/_template.json
Normal file
@ -0,0 +1,270 @@
|
||||
{
|
||||
"preset_name": "Poliigon Standard v2",
|
||||
"supplier_name": "Poliigon",
|
||||
"notes": "Preset for standard Poliigon downloads. Prioritizes _xxx16 files. Moves previews etc. to Extra/. Assumes Metal/Rough workflow.",
|
||||
"source_naming": {
|
||||
"separator": "_",
|
||||
"part_indices": {
|
||||
"base_name": 0,
|
||||
"map_type": 1
|
||||
},
|
||||
"glossiness_keywords": [
|
||||
"GLOSS"
|
||||
],
|
||||
"bit_depth_variants": {
|
||||
"NRM": "*_NRM16*",
|
||||
"DISP": "*_DISP16*"
|
||||
}
|
||||
},
|
||||
"move_to_extra_patterns": [
|
||||
"*_Preview*",
|
||||
"*_Sphere*",
|
||||
"*_Cube*",
|
||||
"*_Flat*",
|
||||
"*.txt",
|
||||
"*.pdf",
|
||||
"*.url",
|
||||
"*.htm*",
|
||||
"*_Fabric.*"
|
||||
],
|
||||
"map_type_mapping": [
|
||||
{
|
||||
"target_type": "MAP_COL",
|
||||
"keywords": [
|
||||
"COLOR*",
|
||||
"COL",
|
||||
"DIFFUSE",
|
||||
"DIF",
|
||||
"ALBEDO"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_NRM",
|
||||
"keywords": [
|
||||
"NORMAL*",
|
||||
"NORM*",
|
||||
"NRM*",
|
||||
"N"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_ROUGH",
|
||||
"keywords": [
|
||||
"ROUGHNESS",
|
||||
"ROUGH"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_ROUGH",
|
||||
"keywords": [
|
||||
"GLOSS"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_AO",
|
||||
"keywords": [
|
||||
"AMBIENTOCCLUSION",
|
||||
"AO"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_DISP",
|
||||
"keywords": [
|
||||
"DISPLACEMENT",
|
||||
"DISP",
|
||||
"HEIGHT",
|
||||
"BUMP"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_REFL",
|
||||
"keywords": [
|
||||
"REFLECTION",
|
||||
"REFL",
|
||||
"SPECULAR",
|
||||
"SPEC"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_SSS",
|
||||
"keywords": [
|
||||
"SSS",
|
||||
"SUBSURFACE*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_FUZZ",
|
||||
"keywords": [
|
||||
"FUZZ"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_IDMAP",
|
||||
"keywords": [
|
||||
"ID*",
|
||||
"IDMAP"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_MASK",
|
||||
"keywords": [
|
||||
"OPAC*",
|
||||
"TRANS*",
|
||||
"MASK*",
|
||||
"ALPHA*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target_type": "MAP_METAL",
|
||||
"keywords": [
|
||||
"METALNESS_",
|
||||
"METALLIC"
|
||||
]
|
||||
}
|
||||
],
|
||||
"asset_category_rules": {
|
||||
"model_patterns": [
|
||||
"*.fbx",
|
||||
"*.obj",
|
||||
"*.blend",
|
||||
"*.mtl"
|
||||
],
|
||||
"decal_keywords": [
|
||||
"Decal"
|
||||
]
|
||||
},
|
||||
"archetype_rules": [
|
||||
[
|
||||
"Foliage",
|
||||
{
|
||||
"match_any": [
|
||||
"Plant",
|
||||
"Leaf",
|
||||
"Leaves",
|
||||
"Grass"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
],
|
||||
[
|
||||
"Fabric",
|
||||
{
|
||||
"match_any": [
|
||||
"Fabric",
|
||||
"Carpet",
|
||||
"Cloth",
|
||||
"Textile",
|
||||
"Leather"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
],
|
||||
[
|
||||
"Wood",
|
||||
{
|
||||
"match_any": [
|
||||
"Wood",
|
||||
"Timber",
|
||||
"Plank",
|
||||
"Board"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
],
|
||||
[
|
||||
"Metal",
|
||||
{
|
||||
"match_any": [
|
||||
"_Metal",
|
||||
"Steel",
|
||||
"Iron",
|
||||
"Gold",
|
||||
"Copper",
|
||||
"Chrome",
|
||||
"Aluminum",
|
||||
"Brass",
|
||||
"Bronze"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
],
|
||||
[
|
||||
"Concrete",
|
||||
{
|
||||
"match_any": [
|
||||
"Concrete",
|
||||
"Cement"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
],
|
||||
[
|
||||
"Ground",
|
||||
{
|
||||
"match_any": [
|
||||
"Ground",
|
||||
"Dirt",
|
||||
"Soil",
|
||||
"Mud",
|
||||
"Sand",
|
||||
"Gravel",
|
||||
"Asphalt",
|
||||
"Road",
|
||||
"Moss"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
],
|
||||
[
|
||||
"Stone",
|
||||
{
|
||||
"match_any": [
|
||||
"Stone",
|
||||
"Rock*",
|
||||
"Marble",
|
||||
"Granite",
|
||||
"Brick",
|
||||
"Tile",
|
||||
"Paving",
|
||||
"Pebble*",
|
||||
"Terrazzo",
|
||||
"Slate"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
],
|
||||
[
|
||||
"Plaster",
|
||||
{
|
||||
"match_any": [
|
||||
"Plaster",
|
||||
"Stucco",
|
||||
"Wall",
|
||||
"Paint"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
],
|
||||
[
|
||||
"Plastic",
|
||||
{
|
||||
"match_any": [
|
||||
"Plastic",
|
||||
"PVC",
|
||||
"Resin",
|
||||
"Rubber"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
],
|
||||
[
|
||||
"Glass",
|
||||
{
|
||||
"match_any": [
|
||||
"Glass"
|
||||
],
|
||||
"match_all": []
|
||||
}
|
||||
]
|
||||
]
|
||||
}
|
||||
44
user_data/config/asset_type_definitions.json
Normal file
44
user_data/config/asset_type_definitions.json
Normal file
@ -0,0 +1,44 @@
|
||||
{
|
||||
"ASSET_TYPE_DEFINITIONS": {
|
||||
"Surface": {
|
||||
"color": "#1f3e5d",
|
||||
"description": "A single Standard PBR material set for a surface.",
|
||||
"examples": [
|
||||
"Set: Wood01_COL + Wood01_NRM + WOOD01_ROUGH",
|
||||
"Set: Dif_Concrete + Normal_Concrete + Refl_Concrete"
|
||||
]
|
||||
},
|
||||
"Model": {
|
||||
"color": "#b67300",
|
||||
"description": "A set that contains models, can include PBR textureset",
|
||||
"examples": [
|
||||
"Single = Chair.fbx",
|
||||
"Set = Plant02.fbx + Plant02_col + Plant02_SSS"
|
||||
]
|
||||
},
|
||||
"Decal": {
|
||||
"color": "#68ac68",
|
||||
"description": "A alphamasked textureset",
|
||||
"examples": [
|
||||
"Set = DecalGraffiti01_Col + DecalGraffiti01_Alpha",
|
||||
"Single = DecalLeakStain03"
|
||||
]
|
||||
},
|
||||
"Atlas": {
|
||||
"color": "#955b8b",
|
||||
"description": "A texture, name usually hints that it's an atlas",
|
||||
"examples": [
|
||||
"Set = FoliageAtlas01_col + FoliageAtlas01_nrm"
|
||||
]
|
||||
},
|
||||
"UtilityMap": {
|
||||
"color": "#706b87",
|
||||
"description": "A useful image-asset consisting of only a single texture. Therefor each Utilitymap can only contain a single item.",
|
||||
"examples": [
|
||||
"Single = imperfection.png",
|
||||
"Single = smudges.png",
|
||||
"Single = scratches.tif"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
210
user_data/config/file_type_definitions.json
Normal file
210
user_data/config/file_type_definitions.json
Normal file
@ -0,0 +1,210 @@
|
||||
{
|
||||
"FILE_TYPE_DEFINITIONS": {
|
||||
"MAP_COL": {
|
||||
"bit_depth_rule": "force_8bit",
|
||||
"color": "#ffaa00",
|
||||
"description": "Color/Albedo Map",
|
||||
"examples": [
|
||||
"_col.",
|
||||
"_basecolor.",
|
||||
"albedo",
|
||||
"diffuse"
|
||||
],
|
||||
"is_grayscale": false,
|
||||
"keybind": "C",
|
||||
"standard_type": "COL"
|
||||
},
|
||||
"MAP_NRM": {
|
||||
"bit_depth_rule": "respect",
|
||||
"color": "#cca2f1",
|
||||
"description": "Normal Map",
|
||||
"examples": [
|
||||
"_nrm.",
|
||||
"_normal."
|
||||
],
|
||||
"is_grayscale": false,
|
||||
"keybind": "N",
|
||||
"standard_type": "NRM"
|
||||
},
|
||||
"MAP_METAL": {
|
||||
"bit_depth_rule": "force_8bit",
|
||||
"color": "#dcf4f2",
|
||||
"description": "Metalness Map",
|
||||
"examples": [
|
||||
"_metal.",
|
||||
"_met."
|
||||
],
|
||||
"is_grayscale": true,
|
||||
"keybind": "M",
|
||||
"standard_type": "METAL"
|
||||
},
|
||||
"MAP_ROUGH": {
|
||||
"bit_depth_rule": "force_8bit",
|
||||
"color": "#bfd6bf",
|
||||
"description": "Roughness Map",
|
||||
"examples": [
|
||||
"_rough.",
|
||||
"_rgh.",
|
||||
"_gloss"
|
||||
],
|
||||
"is_grayscale": true,
|
||||
"keybind": "R",
|
||||
"standard_type": "ROUGH"
|
||||
},
|
||||
"MAP_GLOSS": {
|
||||
"bit_depth_rule": "force_8bit",
|
||||
"color": "#d6bfd6",
|
||||
"description": "Glossiness Map",
|
||||
"examples": [
|
||||
"_gloss.",
|
||||
"_gls."
|
||||
],
|
||||
"is_grayscale": true,
|
||||
"keybind": "R",
|
||||
"standard_type": "GLOSS"
|
||||
},
|
||||
"MAP_AO": {
|
||||
"bit_depth_rule": "force_8bit",
|
||||
"color": "#e3c7c7",
|
||||
"description": "Ambient Occlusion Map",
|
||||
"examples": [
|
||||
"_ao.",
|
||||
"_ambientocclusion."
|
||||
],
|
||||
"is_grayscale": true,
|
||||
"keybind": "",
|
||||
"standard_type": "AO"
|
||||
},
|
||||
"MAP_DISP": {
|
||||
"bit_depth_rule": "respect",
|
||||
"color": "#c6ddd5",
|
||||
"description": "Displacement/Height Map",
|
||||
"examples": [
|
||||
"_disp.",
|
||||
"_height."
|
||||
],
|
||||
"is_grayscale": true,
|
||||
"keybind": "D",
|
||||
"standard_type": "DISP"
|
||||
},
|
||||
"MAP_REFL": {
|
||||
"bit_depth_rule": "force_8bit",
|
||||
"color": "#c2c2b9",
|
||||
"description": "Reflection/Specular Map",
|
||||
"examples": [
|
||||
"_refl.",
|
||||
"_specular."
|
||||
],
|
||||
"is_grayscale": true,
|
||||
"keybind": "M",
|
||||
"standard_type": "REFL"
|
||||
},
|
||||
"MAP_SSS": {
|
||||
"bit_depth_rule": "respect",
|
||||
"color": "#a0d394",
|
||||
"description": "Subsurface Scattering Map",
|
||||
"examples": [
|
||||
"_sss.",
|
||||
"_subsurface."
|
||||
],
|
||||
"is_grayscale": true,
|
||||
"keybind": "",
|
||||
"standard_type": "SSS"
|
||||
},
|
||||
"MAP_FUZZ": {
|
||||
"bit_depth_rule": "force_8bit",
|
||||
"color": "#a2d1da",
|
||||
"description": "Fuzz/Sheen Map",
|
||||
"examples": [
|
||||
"_fuzz.",
|
||||
"_sheen."
|
||||
],
|
||||
"is_grayscale": true,
|
||||
"keybind": "",
|
||||
"standard_type": "FUZZ"
|
||||
},
|
||||
"MAP_IDMAP": {
|
||||
"bit_depth_rule": "force_8bit",
|
||||
"color": "#ca8fb4",
|
||||
"description": "ID Map (for masking)",
|
||||
"examples": [
|
||||
"_id.",
|
||||
"_matid."
|
||||
],
|
||||
"is_grayscale": false,
|
||||
"keybind": "",
|
||||
"standard_type": "IDMAP"
|
||||
},
|
||||
"MAP_MASK": {
|
||||
"bit_depth_rule": "force_8bit",
|
||||
"color": "#c6e2bf",
|
||||
"description": "Generic Mask Map",
|
||||
"examples": [
|
||||
"_mask."
|
||||
],
|
||||
"is_grayscale": true,
|
||||
"keybind": "",
|
||||
"standard_type": "MASK"
|
||||
},
|
||||
"MAP_IMPERFECTION": {
|
||||
"bit_depth_rule": "force_8bit",
|
||||
"color": "#e6d1a6",
|
||||
"description": "Imperfection Map (scratches, dust)",
|
||||
"examples": [
|
||||
"_imp.",
|
||||
"_imperfection.",
|
||||
"splatter",
|
||||
"scratches",
|
||||
"smudges",
|
||||
"hairs",
|
||||
"fingerprints"
|
||||
],
|
||||
"is_grayscale": true,
|
||||
"keybind": "",
|
||||
"standard_type": "IMPERFECTION"
|
||||
},
|
||||
"MODEL": {
|
||||
"bit_depth_rule": "",
|
||||
"color": "#3db2bd",
|
||||
"description": "3D Model File",
|
||||
"examples": [
|
||||
".fbx",
|
||||
".obj"
|
||||
],
|
||||
"is_grayscale": false,
|
||||
"keybind": "",
|
||||
"standard_type": ""
|
||||
},
|
||||
"EXTRA": {
|
||||
"bit_depth_rule": "",
|
||||
"color": "#8c8c8c",
|
||||
"description": "asset previews or metadata",
|
||||
"examples": [
|
||||
".txt",
|
||||
".zip",
|
||||
"preview.",
|
||||
"_flat.",
|
||||
"_sphere.",
|
||||
"_Cube.",
|
||||
"thumb"
|
||||
],
|
||||
"is_grayscale": false,
|
||||
"keybind": "E",
|
||||
"standard_type": "EXTRA"
|
||||
},
|
||||
"FILE_IGNORE": {
|
||||
"bit_depth_rule": "",
|
||||
"color": "#673d35",
|
||||
"description": "File identified to be ignored due to prioritization rules (e.g., a lower bit-depth version when a higher one is present).",
|
||||
"category": "Ignored",
|
||||
"examples": [
|
||||
"Thumbs.db",
|
||||
".DS_Store"
|
||||
],
|
||||
"is_grayscale": false,
|
||||
"keybind": "X",
|
||||
"standard_type": "",
|
||||
"details": {}
|
||||
}
|
||||
}
|
||||
}
|
||||
267
user_data/config/llm_settings.json
Normal file
267
user_data/config/llm_settings.json
Normal file
@ -0,0 +1,267 @@
|
||||
{
|
||||
"llm_predictor_examples": [
|
||||
{
|
||||
"input": "MessyTextures/Concrete_Damage_Set/concrete_col.png\nMessyTextures/Concrete_Damage_Set/concrete_N.png\nMessyTextures/Concrete_Damage_Set/concrete_rough.jpg\nMessyTextures/Concrete_Damage_Set/height_map_concrete.tif\nMessyTextures/Concrete_Damage_Set/Thumbs.db\nMessyTextures/Fabric_Pattern/pattern_01_diffuse.tga\nMessyTextures/Fabric_Pattern/pattern_01_ao.png\nMessyTextures/Fabric_Pattern/pattern_01_normal.png\nMessyTextures/Fabric_Pattern/notes.txt\nMessyTextures/Fabric_Pattern/variant_blue_diffuse.tga\nMessyTextures/Fabric_Pattern/fabric_flat.jpg",
|
||||
"output": {
|
||||
"individual_file_analysis": [
|
||||
{
|
||||
"relative_file_path": "MessyTextures/Concrete_Damage_Set/concrete_col.png",
|
||||
"classified_file_type": "MAP_COL",
|
||||
"proposed_asset_group_name": "Concrete_Damage_Set"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "MessyTextures/Concrete_Damage_Set/concrete_N.png",
|
||||
"classified_file_type": "MAP_NRM",
|
||||
"proposed_asset_group_name": "Concrete_Damage_Set"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "MessyTextures/Concrete_Damage_Set/concrete_rough.jpg",
|
||||
"classified_file_type": "MAP_ROUGH",
|
||||
"proposed_asset_group_name": "Concrete_Damage_Set"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "MessyTextures/Concrete_Damage_Set/height_map_concrete.tif",
|
||||
"classified_file_type": "MAP_DISP",
|
||||
"proposed_asset_group_name": "Concrete_Damage_Set"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "MessyTextures/Concrete_Damage_Set/Thumbs.db",
|
||||
"classified_file_type": "FILE_IGNORE",
|
||||
"proposed_asset_group_name": null
|
||||
},
|
||||
{
|
||||
"relative_file_path": "MessyTextures/Fabric_Pattern/pattern_01_diffuse.tga",
|
||||
"classified_file_type": "MAP_COL",
|
||||
"proposed_asset_group_name": "Fabric_Pattern_01"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "MessyTextures/Fabric_Pattern/pattern_01_ao.png",
|
||||
"classified_file_type": "MAP_AO",
|
||||
"proposed_asset_group_name": "Fabric_Pattern_01"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "MessyTextures/Fabric_Pattern/pattern_01_normal.png",
|
||||
"classified_file_type": "MAP_NRM",
|
||||
"proposed_asset_group_name": "Fabric_Pattern_01"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "MessyTextures/Fabric_Pattern/notes.txt",
|
||||
"classified_file_type": "EXTRA",
|
||||
"proposed_asset_group_name": "Fabric_Pattern_01"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "MessyTextures/Fabric_Pattern/variant_blue_diffuse.tga",
|
||||
"classified_file_type": "MAP_COL",
|
||||
"proposed_asset_group_name": "Fabric_Pattern_01"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "MessyTextures/Fabric_Pattern/fabric_flat.jpg",
|
||||
"classified_file_type": "EXTRA",
|
||||
"proposed_asset_group_name": "Fabric_Pattern_01"
|
||||
}
|
||||
],
|
||||
"asset_group_classifications": {
|
||||
"Concrete_Damage_Set": "Surface",
|
||||
"Fabric_Pattern_01": "Surface"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"input": "SciFi_Drone/Drone_Model.fbx\nSciFi_Drone/Textures/Drone_BaseColor.png\nSciFi_Drone/Textures/Drone_Metallic.png\nSciFi_Drone/Textures/Drone_Roughness.png\nSciFi_Drone/Textures/Drone_Normal.png\nSciFi_Drone/Textures/Drone_Emissive.jpg\nSciFi_Drone/ReferenceImages/concept.jpg",
|
||||
"output": {
|
||||
"individual_file_analysis": [
|
||||
{
|
||||
"relative_file_path": "SciFi_Drone/Drone_Model.fbx",
|
||||
"classified_file_type": "MODEL",
|
||||
"proposed_asset_group_name": "SciFi_Drone"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "SciFi_Drone/Textures/Drone_BaseColor.png",
|
||||
"classified_file_type": "MAP_COL",
|
||||
"proposed_asset_group_name": "SciFi_Drone"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "SciFi_Drone/Textures/Drone_Metallic.png",
|
||||
"classified_file_type": "MAP_METAL",
|
||||
"proposed_asset_group_name": "SciFi_Drone"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "SciFi_Drone/Textures/Drone_Roughness.png",
|
||||
"classified_file_type": "MAP_ROUGH",
|
||||
"proposed_asset_group_name": "SciFi_Drone"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "SciFi_Drone/Textures/Drone_Normal.png",
|
||||
"classified_file_type": "MAP_NRM",
|
||||
"proposed_asset_group_name": "SciFi_Drone"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "SciFi_Drone/Textures/Drone_Emissive.jpg",
|
||||
"classified_file_type": "EXTRA",
|
||||
"proposed_asset_group_name": "SciFi_Drone"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "SciFi_Drone/ReferenceImages/concept.jpg",
|
||||
"classified_file_type": "EXTRA",
|
||||
"proposed_asset_group_name": "SciFi_Drone"
|
||||
}
|
||||
],
|
||||
"asset_group_classifications": {
|
||||
"SciFi_Drone": "Model"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"input": "21_hairs_deposits.tif\n22_hairs_fabric.tif\n23_hairs_fibres.tif\n24_hairs_fibres.tif\n25_bonus_isolatedFingerprints.tif\n26_bonus_isolatedPalmprint.tif\n27_metal_aluminum.tif\n28_metal_castIron.tif\n29_scratcehes_deposits_shapes.tif\n30_scratches_deposits.tif",
|
||||
"output": {
|
||||
"individual_file_analysis": [
|
||||
{
|
||||
"relative_file_path": "21_hairs_deposits.tif",
|
||||
"classified_file_type": "MAP_IMPERFECTION",
|
||||
"proposed_asset_group_name": "Hairs_Deposits_21"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "22_hairs_fabric.tif",
|
||||
"classified_file_type": "MAP_IMPERFECTION",
|
||||
"proposed_asset_group_name": "Hairs_Fabric_22"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "23_hairs_fibres.tif",
|
||||
"classified_file_type": "MAP_IMPERFECTION",
|
||||
"proposed_asset_group_name": "Hairs_Fibres_23"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "24_hairs_fibres.tif",
|
||||
"classified_file_type": "MAP_IMPERFECTION",
|
||||
"proposed_asset_group_name": "Hairs_Fibres_24"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "25_bonus_isolatedFingerprints.tif",
|
||||
"classified_file_type": "MAP_IMPERFECTION",
|
||||
"proposed_asset_group_name": "Bonus_IsolatedFingerprints_25"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "26_bonus_isolatedPalmprint.tif",
|
||||
"classified_file_type": "MAP_IMPERFECTION",
|
||||
"proposed_asset_group_name": "Bonus_IsolatedPalmprint_26"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "27_metal_aluminum.tif",
|
||||
"classified_file_type": "MAP_IMPERFECTION",
|
||||
"proposed_asset_group_name": "Metal_Aluminum_27"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "28_metal_castIron.tif",
|
||||
"classified_file_type": "MAP_IMPERFECTION",
|
||||
"proposed_asset_group_name": "Metal_CastIron_28"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "29_scratcehes_deposits_shapes.tif",
|
||||
"classified_file_type": "MAP_IMPERFECTION",
|
||||
"proposed_asset_group_name": "Scratches_Deposits_Shapes_29"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "30_scratches_deposits.tif",
|
||||
"classified_file_type": "MAP_IMPERFECTION",
|
||||
"proposed_asset_group_name": "Scratches_Deposits_30"
|
||||
}
|
||||
],
|
||||
"asset_group_classifications": {
|
||||
"Hairs_Deposits_21": "UtilityMap",
|
||||
"Hairs_Fabric_22": "UtilityMap",
|
||||
"Hairs_Fibres_23": "UtilityMap",
|
||||
"Hairs_Fibres_24": "UtilityMap",
|
||||
"Bonus_IsolatedFingerprints_25": "UtilityMap",
|
||||
"Bonus_IsolatedPalmprint_26": "UtilityMap",
|
||||
"Metal_Aluminum_27": "UtilityMap",
|
||||
"Metal_CastIron_28": "UtilityMap",
|
||||
"Scratches_Deposits_Shapes_29": "UtilityMap",
|
||||
"Scratches_Deposits_30": "UtilityMap"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"input": "Part1/TextureSupply_Boards001_A_28x300cm-Albedo.jpg\nPart1/TextureSupply_Boards001_A_28x300cm-Normal.jpg\nPart1/TextureSupply_Boards001_B_28x300cm-Albedo.jpg\nPart1/TextureSupply_Boards001_B_28x300cm-Normal.jpg\nPart1/TextureSupply_Boards001_C_28x300cm-Albedo.jpg\nPart1/TextureSupply_Boards001_C_28x300cm-Normal.jpg\nPart1/TextureSupply_Boards001_D_28x300cm-Albedo.jpg\nPart1/TextureSupply_Boards001_D_28x300cm-Normal.jpg\nPart1/TextureSupply_Boards001_E_28x300cm-Albedo.jpg\nPart1/TextureSupply_Boards001_E_28x300cm-Normal.jpg\nPart1/TextureSupply_Boards001_F_28x300cm-Albedo.jpg\nPart1/TextureSupply_Boards001_F_28x300cm-Normal.jpg",
|
||||
"output": {
|
||||
"individual_file_analysis": [
|
||||
{
|
||||
"relative_file_path": "Part1/TextureSupply_Boards001_A_28x300cm-Albedo.jpg",
|
||||
"classified_file_type": "MAP_COL",
|
||||
"proposed_asset_group_name": "Boards001_A"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "Part1/TextureSupply_Boards001_A_28x300cm-Normal.jpg",
|
||||
"classified_file_type": "MAP_NRM",
|
||||
"proposed_asset_group_name": "Boards001_A"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "Part1/TextureSupply_Boards001_B_28x300cm-Albedo.jpg",
|
||||
"classified_file_type": "MAP_COL",
|
||||
"proposed_asset_group_name": "Boards001_B"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "Part1/TextureSupply_Boards001_B_28x300cm-Normal.jpg",
|
||||
"classified_file_type": "MAP_NRM",
|
||||
"proposed_asset_group_name": "Boards001_B"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "Part1/TextureSupply_Boards001_C_28x300cm-Albedo.jpg",
|
||||
"classified_file_type": "MAP_COL",
|
||||
"proposed_asset_group_name": "Boards001_C"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "Part1/TextureSupply_Boards001_C_28x300cm-Normal.jpg",
|
||||
"classified_file_type": "MAP_NRM",
|
||||
"proposed_asset_group_name": "Boards001_C"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "Part1/TextureSupply_Boards001_D_28x300cm-Albedo.jpg",
|
||||
"classified_file_type": "MAP_COL",
|
||||
"proposed_asset_group_name": "Boards001_D"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "Part1/TextureSupply_Boards001_D_28x300cm-Normal.jpg",
|
||||
"classified_file_type": "MAP_NRM",
|
||||
"proposed_asset_group_name": "Boards001_D"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "Part1/TextureSupply_Boards001_E_28x300cm-Albedo.jpg",
|
||||
"classified_file_type": "MAP_COL",
|
||||
"proposed_asset_group_name": "Boards001_E"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "Part1/TextureSupply_Boards001_E_28x300cm-Normal.jpg",
|
||||
"classified_file_type": "MAP_NRM",
|
||||
"proposed_asset_group_name": "Boards001_E"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "Part1/TextureSupply_Boards001_F_28x300cm-Albedo.jpg",
|
||||
"classified_file_type": "MAP_COL",
|
||||
"proposed_asset_group_name": "Boards001_F"
|
||||
},
|
||||
{
|
||||
"relative_file_path": "Part1/TextureSupply_Boards001_F_28x300cm-Normal.jpg",
|
||||
"classified_file_type": "MAP_NRM",
|
||||
"proposed_asset_group_name": "Boards001_F"
|
||||
}
|
||||
],
|
||||
"asset_group_classifications": {
|
||||
"Boards001_A": "Surface",
|
||||
"Boards001_B": "Surface",
|
||||
"Boards001_C": "Surface",
|
||||
"Boards001_D": "Surface",
|
||||
"Boards001_E": "Surface",
|
||||
"Boards001_F": "Surface"
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
"asset_type_definition_format": "{KEY} = {DESCRIPTION}, examples of content of {KEY} could be: {EXAMPLES}",
|
||||
"file_type_definition_format": "{KEY} = {DESCRIPTION}, examples of keywords for {KEY} could be: {EXAMPLES}",
|
||||
"llm_endpoint_url": "http://100.65.14.122:1234/v1/chat/completions",
|
||||
"llm_api_key": "",
|
||||
"llm_model_name": "qwen2.5-coder:3b",
|
||||
"llm_temperature": 0.5,
|
||||
"llm_request_timeout": 120,
|
||||
"llm_predictor_prompt": "You are an expert asset classification system. Your task is to analyze a list of file paths, understand their relationships based on naming and directory structure, and output a structured JSON object that classifies each file individually and then classifies the logical asset groups they belong to.\\n\\nDefinitions:\\n\\nAsset Types: These define the overall category of a logical asset group. Use one of the following keys when classifying asset groups. Each definition is provided as a formatted string (e.g., 'Surface = A single PBR material set..., examples: WoodFloor01, MetalPlate05'):\\n{ASSET_TYPE_DEFINITIONS}\\n\\n\\nFile Types: These define the specific purpose of each individual file. Use one of the following keys when classifying individual files. Each definition is provided as a formatted string (e.g., 'MAP_COL = Color/Albedo Map, examples: _col., _basecolor.'):\\n{FILE_TYPE_DEFINITIONS}\\n\\n\\nCore Task & Logic:\\n\\n1. **Individual File Analysis:**\\n * Examine each `relative_file_path` in the input `FILE_LIST`.\\n * For EACH file, determine its most likely `classified_file_type` using the `FILE_TYPE_DEFINITIONS`. Pay attention to filename suffixes, keywords, and extensions. Use `FILE_IGNORE` for files like `Thumbs.db` or `.DS_Store`. Use `EXTRA` for previews, metadata, or unidentifiable maps.\\n * For EACH file, propose a logical `proposed_asset_group_name` (string). This name should represent the asset the file likely belongs to, based on common base names (e.g., `WoodFloor01` from `WoodFloor01_col.png`, `WoodFloor01_nrm.png`) or directory structure (e.g., `SciFi_Drone` for files within that folder).\\n * Files that seem to be standalone utility maps (like `scratches.png`, `FlowMap.tif`) should get a unique group name derived from their filename (e.g., `Scratches`, `FlowMap`).\\n * If a file doesn't seem to belong to any logical group (e.g., a stray readme file in the root), you can propose `null` or a generic name like `Miscellaneous`.\\n * Be consistent with the proposed names for files belonging to the same logical asset.\\n * Populate the `individual_file_analysis` array with one object for *every* file in the input list, containing `relative_file_path`, `classified_file_type`, and `proposed_asset_group_name`.\\n\\n2. **Asset Group Classification:**\\n * Collect all unique, non-null `proposed_asset_group_name` values generated in the previous step.\\n * For EACH unique group name, determine the overall `asset_type` (using `ASSET_TYPE_DEFINITIONS`) based on the types of files assigned to that group name in the `individual_file_analysis`.\\n * Example: If files proposed as `AssetGroup1` include `MAP_COL`, `MAP_NRM`, `MAP_ROUGH`, classify `AssetGroup1` as `Surface`.\\n * Example: If files proposed as `AssetGroup2` include `MODEL` and texture maps, classify `AssetGroup2` as `Model`.\\n * Example: If `AssetGroup3` only has one file classified as `MAP_IMPERFECTION`, classify `AssetGroup3` as `UtilityMap`.\\n * Populate the `asset_group_classifications` dictionary, mapping each unique `proposed_asset_group_name` to its determined `asset_type`.\\n\\nInput File List:\\n\\ntext\\n{FILE_LIST}\\n\\n\\nOutput Format:\\n\\nYour response MUST be ONLY a single JSON object. You MAY include comments (using // or /* */) within the JSON structure for clarification if needed, but the core structure must be valid JSON. Do NOT include any text, explanations, or introductory phrases before or after the JSON object itself. Ensure all strings are correctly quoted and escaped.\\n\\nCRITICAL: The output JSON structure must strictly adhere to the following format:\\n\\n```json\\n{{\\n \"individual_file_analysis\": [\\n {{\\n // Optional comment about this file\\n \"relative_file_path\": \"string\", // Exact relative path from the input list\\n \"classified_file_type\": \"string\", // Key from FILE_TYPE_DEFINITIONS\\n \"proposed_asset_group_name\": \"string_or_null\" // Your suggested group name for this file\\n }}\\n // ... one object for EVERY file in the input list\\n ],\\n \"asset_group_classifications\": {{\\n // Dictionary mapping unique proposed group names to asset types\\n \"ProposedGroupName1\": \"string\", // Key: proposed_asset_group_name, Value: Key from ASSET_TYPE_DEFINITIONS\\n \"ProposedGroupName2\": \"string\"\\n // ... one entry for each unique, non-null proposed_asset_group_name\\n }}\\n}}\\n```\\n\\nExamples:\\n\\nHere are examples of input file lists and the desired JSON output, illustrating the two-part structure:\\n\\njson\\n[\\n {EXAMPLE_INPUT_OUTPUT_PAIRS}\\n]\\n\\n\\nNow, process the provided FILE_LIST and generate ONLY the JSON output according to these instructions. Remember to include an entry in `individual_file_analysis` for every single input file path."
|
||||
}
|
||||
11
user_data/config/suppliers.json
Normal file
11
user_data/config/suppliers.json
Normal file
@ -0,0 +1,11 @@
|
||||
{
|
||||
"Dimensiva": {
|
||||
"normal_map_type": "OpenGL"
|
||||
},
|
||||
"Dinesen": {
|
||||
"normal_map_type": "OpenGL"
|
||||
},
|
||||
"Poliigon": {
|
||||
"normal_map_type": "OpenGL"
|
||||
}
|
||||
}
|
||||
8
user_data/user_settings.json
Normal file
8
user_data/user_settings.json
Normal file
@ -0,0 +1,8 @@
|
||||
{
|
||||
"OUTPUT_BASE_DIR": "G:/02 Content/10-19 Content/13 Textures Power of Two/TestOutput",
|
||||
"OUTPUT_DIRECTORY_PATTERN": "[supplier]/[asset_category]/[asset_name]",
|
||||
"OUTPUT_FORMAT_16BIT_PRIMARY": "png",
|
||||
"OUTPUT_FORMAT_8BIT": "png",
|
||||
"RESOLUTION_THRESHOLD_FOR_JPG": 4096,
|
||||
"general_settings": {}
|
||||
}
|
||||
@ -9,6 +9,7 @@ from typing import Optional, Dict
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
def generate_path_from_pattern(pattern_string: str, token_data: dict) -> str:
|
||||
logger.debug(f"generate_path_from_pattern called with pattern: '{pattern_string}', token_data keys: {list(token_data.keys())}")
|
||||
"""
|
||||
Generates a file path by replacing tokens in a pattern string with values
|
||||
from the provided token_data dictionary.
|
||||
@ -54,7 +55,8 @@ def generate_path_from_pattern(pattern_string: str, token_data: dict) -> str:
|
||||
# Add variations like #### for IncrementingValue
|
||||
known_tokens_lc = {
|
||||
'assettype', 'supplier', 'assetname', 'resolution', 'ext',
|
||||
'incrementingvalue', '####', 'date', 'time', 'sha5', 'applicationpath'
|
||||
'incrementingvalue', '####', 'date', 'time', 'sha5', 'applicationpath',
|
||||
'asset_category'
|
||||
}
|
||||
|
||||
output_path = pattern_string
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user