06e79082
tangwang
接口优化
|
1
2
3
4
5
|
<!-- b5a93a00-49d7-4266-8dbf-3d3f708334ed c9ba91cf-2b58-440d-86d1-35b805e5d3cf -->
# Configuration and Pipeline Separation Refactoring
## Overview
|
ae5a294d
tangwang
命名修改、代码清理
|
6
|
Implement clean separation between **Search Configuration** (tenant-facing, ES/search focused) and **Data Pipeline** (internal ETL, script-controlled). Configuration files will only contain search engine settings, while data source and transformation logic will be controlled entirely by script parameters.
|
06e79082
tangwang
接口优化
|
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
|
## Phase 1: Configuration File Cleanup
### 1.1 Clean BASE Configuration
**File**: [`config/schema/base/config.yaml`](config/schema/base/config.yaml)
**Remove** (data pipeline concerns):
- `mysql_config` section
- `main_table` field
- `sku_table` field
- `extension_table` field
- `source_table` in field definitions
- `source_column` in field definitions
**Keep** (search configuration):
|
ae5a294d
tangwang
命名修改、代码清理
|
25
|
- `tenant_name`
|
06e79082
tangwang
接口优化
|
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
- `es_index_name`
- `es_settings`
- `fields` (simplified, no source mapping)
- `indexes` (search domains)
- `query_config`
- `function_score`
- `rerank`
- `spu_config`
- `tenant_config` (as template)
- `default_facets`
**Simplify field definitions**:
```yaml
fields:
- name: "title"
type: "TEXT"
analyzer: "chinese_ecommerce"
boost: 3.0
index: true
store: true
# NO source_table, NO source_column
```
### 1.2 Update Legacy Configuration
|
ae5a294d
tangwang
命名修改、代码清理
|
52
|
**File**: [`config/schema/tenant1_legacy/config.yaml`](config/schema/tenant1_legacy/config.yaml)
|
06e79082
tangwang
接口优化
|
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
|
Apply same cleanup as BASE config, marking it as legacy in comments.
## Phase 2: Transformer Architecture Refactoring
### 2.1 Create Base Transformer Class
**File**: [`indexer/base_transformer.py`](indexer/base_transformer.py) (NEW)
Create abstract base class with shared logic:
- `__init__` with config, encoders, cache
- `_convert_value()` - type conversion (shared)
- `_generate_text_embeddings()` - text embedding (shared)
- `_generate_image_embeddings()` - image embedding (shared)
- `_inject_tenant_id()` - tenant_id injection (shared)
- `@abstractmethod transform()` - to be implemented by subclasses
### 2.2 Refactor DataTransformer
**File**: [`indexer/data_transformer.py`](indexer/data_transformer.py)
Changes:
- Inherit from `BaseDataTransformer`
- Remove dependency on `source_table`, `source_column` from config
- Accept field mapping as parameter (from script)
- Implement `transform(df, field_mapping)` method
### 2.3 Refactor SPUDataTransformer
**File**: [`indexer/spu_data_transformer.py`](indexer/spu_data_transformer.py)
Changes:
- Inherit from `BaseDataTransformer`
- Remove dependency on config's table names
- Accept field mapping as parameter
- Implement `transform(spu_df, sku_df, spu_field_mapping, sku_field_mapping)` method
### 2.4 Create Transformer Factory
**File**: [`indexer/transformer_factory.py`](indexer/transformer_factory.py) (NEW)
Factory to create appropriate transformer based on parameters:
```python
class TransformerFactory:
@staticmethod
def create(
transformer_type: str, # 'sku' or 'spu'
|
ae5a294d
tangwang
命名修改、代码清理
|
104
|
config: TenantConfig,
|
06e79082
tangwang
接口优化
|
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
|
text_encoder=None,
image_encoder=None
) -> BaseDataTransformer:
if transformer_type == 'spu':
return SPUDataTransformer(config, text_encoder, image_encoder)
elif transformer_type == 'sku':
return DataTransformer(config, text_encoder, image_encoder)
else:
raise ValueError(f"Unknown transformer type: {transformer_type}")
```
### 2.5 Update Package Exports
**File**: [`indexer/__init__.py`](indexer/**init**.py)
Export new structure:
```python
from .base_transformer import BaseDataTransformer
from .data_transformer import DataTransformer
from .spu_data_transformer import SPUDataTransformer
from .transformer_factory import TransformerFactory
__all__ = [
'BaseDataTransformer',
'DataTransformer',
'SPUDataTransformer',
'TransformerFactory', # Recommended for new code
'BulkIndexer',
'IndexingPipeline',
]
```
## Phase 3: Script Refactoring
### 3.1 Create Unified Ingestion Script
**File**: [`scripts/ingest_universal.py`](scripts/ingest_universal.py) (NEW)
Universal ingestion script with full parameter control:
**Parameters**:
```bash
# Search configuration (pure)
--config base # Which search config to use
# Runtime parameters
--tenant-id shop_12345 # REQUIRED tenant identifier
--es-host http://localhost:9200
--es-username elastic
--es-password xxx
# Data source parameters (pipeline concern)
--data-source mysql # mysql, csv, api, etc.
--mysql-host 120.79.247.228
--mysql-port 3316
--mysql-database saas
--mysql-username saas
--mysql-password xxx
# Transformer parameters (pipeline concern)
--transformer spu # spu or sku
--spu-table shoplazza_product_spu
--sku-table shoplazza_product_sku
--shop-id 1 # Filter by shop_id
# Field mapping (optional, uses defaults if not provided)
--field-mapping mapping.json
# Processing parameters
--batch-size 100
--limit 1000
--skip-embeddings
--recreate-index
```
**Logic**:
1. Load search config (clean, no data source info)
2. Set tenant_id from parameter
3. Connect to data source based on `--data-source` parameter
4. Load data from tables specified by parameters
5. Create transformer based on `--transformer` parameter
6. Apply field mapping (default or custom)
7. Transform and index
### 3.2 Update BASE Ingestion Script
**File**: [`scripts/ingest_base.py`](scripts/ingest_base.py)
Update to use script parameters instead of config values:
- Remove dependency on `config.mysql_config`
- Remove dependency on `config.main_table`, `config.sku_table`
- Get all data source info from command-line arguments
- Use TransformerFactory
### 3.3 Create Field Mapping Helper
**File**: [`scripts/field_mapping_generator.py`](scripts/field_mapping_generator.py) (NEW)
Helper script to generate default field mappings:
```python
# Generate default mapping for Shoplazza SPU schema
python scripts/field_mapping_generator.py \
--source shoplazza \
--level spu \
--output mappings/shoplazza_spu.json
```
Output example:
```json
{
"spu_fields": {
"id": "id",
"title": "title",
"description": "description",
...
},
"sku_fields": {
"id": "id",
"price": "price",
"sku": "sku",
...
}
}
```
## Phase 4: Configuration Loader Updates
### 4.1 Simplify ConfigLoader
**File**: [`config/config_loader.py`](config/config_loader.py)
Changes:
- Remove parsing of `mysql_config`
- Remove parsing of `main_table`, `sku_table`, `extension_table`
- Remove validation of source_table/source_column in fields
- Simplify field parsing (no source mapping)
- Keep validation of ES/search related config
|
ae5a294d
tangwang
命名修改、代码清理
|
250
|
### 4.2 Update TenantConfig Model
|
06e79082
tangwang
接口优化
|
251
|
|
ae5a294d
tangwang
命名修改、代码清理
|
252
|
**File**: [`config/__init__.py`](config/**init**.py) or wherever TenantConfig is defined
|
06e79082
tangwang
接口优化
|
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
|
Remove attributes:
- `mysql_config`
- `main_table`
- `sku_table`
- `extension_table`
Add attributes:
- `tenant_id` (runtime, default None)
Simplify FieldConfig:
- Remove `source_table`
- Remove `source_column`
## Phase 5: Documentation Updates
### 5.1 Create Pipeline Guide
**File**: [`docs/DATA_PIPELINE_GUIDE.md`](docs/DATA_PIPELINE_GUIDE.md) (NEW)
Document:
- Separation of concerns (config vs pipeline)
- How to use `ingest_universal.py`
- Default field mappings for common sources
- Custom field mapping examples
- Transformer selection guide
### 5.2 Update BASE Config Guide
**File**: [`docs/BASE_CONFIG_GUIDE.md`](docs/BASE_CONFIG_GUIDE.md)
Update to reflect:
- Config only contains search settings
- No data source configuration
- How tenant_id is injected at runtime
- Examples of using same config with different data sources
### 5.3 Update API Documentation
**File**: [`API_DOCUMENTATION.md`](API_DOCUMENTATION.md)
No changes needed (API layer doesn't know about data pipeline).
### 5.4 Update Design Documentation
**File**: [`设计文档.md`](设计文档.md)
Add section on configuration architecture:
- Clear separation between search config and pipeline
- Benefits of this approach
- How to extend for new data sources
## Phase 6: Create Default Field Mappings
### 6.1 Shoplazza SPU Mapping
**File**: [`mappings/shoplazza_spu.json`](mappings/shoplazza_spu.json) (NEW)
Default field mapping for Shoplazza SPU/SKU tables to BASE config fields.
### 6.2 Shoplazza SKU Mapping (Legacy)
**File**: [`mappings/shoplazza_sku_legacy.json`](mappings/shoplazza_sku_legacy.json) (NEW)
Default field mapping for legacy SKU-level indexing.
### 6.3 CSV Template Mapping
**File**: [`mappings/csv_template.json`](mappings/csv_template.json) (NEW)
Example mapping for CSV data sources.
## Phase 7: Testing & Validation
### 7.1 Test Script with Different Sources
Test `ingest_universal.py` with:
1. MySQL Shoplazza tables (SPU level)
2. MySQL Shoplazza tables (SKU level, legacy)
3. CSV files (if time permits)
### 7.2 Verify Configuration Portability
Test same BASE config with:
- Different data sources
- Different field mappings
- Different transformers
### 7.3 Update Test Scripts
**File**: [`scripts/test_base.sh`](scripts/test_base.sh)
Update to use new script parameters.
## Phase 8: Migration & Cleanup
### 8.1 Create Migration Guide
**File**: [`docs/CONFIG_MIGRATION_GUIDE.md`](docs/CONFIG_MIGRATION_GUIDE.md) (NEW)
Guide for migrating from old config format to new:
- What changed
- How to update existing configs
- How to update ingestion scripts
- Breaking changes
### 8.2 Update Example Configs
Update all example configurations to new format.
### 8.3 Mark Old Scripts as Deprecated
Add deprecation warnings to scripts that still use old config format.
## Key Design Principles
### 1. Separation of Concerns
|
ae5a294d
tangwang
命名修改、代码清理
|
380
|
**Search Configuration** (tenant-facing):
|
06e79082
tangwang
接口优化
|
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
|
- What fields exist in ES
- How fields are analyzed/indexed
- Search strategies and ranking
- Facets and aggregations
- Query processing rules
**Data Pipeline** (internal):
- Where data comes from
- How to connect to data sources
- Which tables/files to read
- How to transform data
- Field mapping logic
### 2. Configuration Portability
Same search config can be used with:
- Different data sources (MySQL, CSV, API)
- Different schemas (with appropriate mapping)
- Different transformation strategies
### 3. Flexibility
Pipeline decisions (transformer, data source, field mapping) made at runtime, not in config.
## Migration Path
### For Existing Users
1. Update config files (remove data source settings)
2. Update ingestion commands (add new parameters)
3. Optionally create field mapping files for convenience
### For New Users
1. Copy BASE config (already clean)
2. Run `ingest_universal.py` with appropriate parameters
3. Provide custom field mapping if needed
## Success Criteria
- [ ] BASE config contains ZERO data source information
- [ ] Same config works with MySQL and CSV sources
- [ ] Pipeline fully controlled by script parameters
- [ ] Transformers work with external field mapping
- [ ] Documentation clearly separates concerns
- [ ] Tests validate portability
- [ ] Migration guide provided
## Estimated Effort
- Configuration cleanup: 2 hours
- Transformer refactoring: 4-5 hours
- Script refactoring: 3-4 hours
- Config loader updates: 2 hours
- Documentation: 2-3 hours
- Testing & validation: 2-3 hours
- **Total: 15-19 hours**
## Benefits
✅ **Clean separation of concerns**
✅ **Configuration reusability across data sources**
|
ae5a294d
tangwang
命名修改、代码清理
|
448
|
✅ **Tenant doesn't need to understand ETL**
|
06e79082
tangwang
接口优化
|
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
|
✅ **Easier to add new data sources**
✅ **More flexible pipeline control**
✅ **Reduced configuration complexity**
### To-dos
- [ ] Clean BASE and legacy configs: remove mysql_config, table names, source_table/source_column from fields
- [ ] Create BaseDataTransformer abstract class with shared logic (type conversion, embeddings, tenant_id)
- [ ] Refactor DataTransformer and SPUDataTransformer to inherit from base, accept field mapping as parameter
- [ ] Create TransformerFactory for creating transformers based on type parameter
- [ ] Create ingest_universal.py with full parameter control for data source, transformer, field mapping
- [ ] Update scripts/ingest_base.py to use parameters instead of config for data source
- [ ] Create field_mapping_generator.py and default mapping files (shoplazza_spu.json, etc.)
- [ ] Simplify ConfigLoader to only parse search config, remove data source parsing
- [ ] Create DATA_PIPELINE_GUIDE.md documenting pipeline approach and config separation
- [ ] Update BASE_CONFIG_GUIDE.md to reflect config-only-search-settings approach
- [ ] Create CONFIG_MIGRATION_GUIDE.md for migrating from old to new config format
- [ ] Test same config with different data sources and validate portability
|